diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index c18ee545e..b3701944d 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -81,7 +81,7 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
 import { storeMutations } from "@/constants/store-mutations";
 import baseMixin from "@/mixins/base-mixin";
-import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getDamageString, isGlassAvailableForCarId } from "@/helpers/damage-helper";
 
 defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -203,7 +203,7 @@ export default {
 				this.$refs.funnelFooter.removeLoader();
 				return;				
 			} else if (carsFound.length == 1) {			
-				var carFound = carsFound[0].vehicle;
+				const carFound = carsFound[0].vehicle;
 
 				if (carEntered.carId == carFound.carId || carFound.carId == this.previousCarIdFound) {
 					// update data
@@ -243,17 +243,14 @@ export default {
 			if (carsFound.length == 1) {
 				// get the damage options for the car that was found
 				const carFound = carsFound[0].vehicle;
-				const glassOptions = await baseMixin.methods.dispatchNonBlockingStoreAction(
-					storeActions.GET_DAMAGE_OPTIONS,
-					{ carId: carFound.carId }
-				);
 
-				// if the car entered is the same as the car found OR the glass options for the found car match the users damage selections
+				// if the car entered is the same as the car found or the selected glass is available for the car that was found
 				if (carEntered.carId == carFound.carId || isGlassAvailableForCarId(carFound.carId)) {
 					navigateAfterSaveToHeritageFunnel(this.$route);
 				} else {
 					// if not then navigate to the "vehicle-damage" page
-					this.$router.navigateAfterSave(this.navigationScenarios.CLICKED_FORWARD, this.$route, {}, { displayVehicleChangeAlert: true }, {});					
+					store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
+					this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_DIFFERENT_GLASS, this.$route, {}, { displayVehicleChangeAlert: true }, {});					
 				}
 			} else if (carsFound.length > 1) {
 				// if multiple cars were found 
@@ -268,12 +265,12 @@ export default {
 
 		},
 		validateZip(zip) {
-			return baseMixin.methods.dispatchNonBlockingStoreAction(
+			return baseMixin.methods.dispatchStoreAction(
 				storeActions.VALIDATE_ZIP, 
 				{ zip });
 		},
 		lookupVin(lastName, streetAddress, zip, state) {
-			return baseMixin.methods.dispatchNonBlockingStoreAction(
+			return baseMixin.methods.dispatchStoreAction(
 				storeActions.LOOKUP_VIN_BY_ADDRESS,
 				{ 
 					licenseLastName: lastName, 
@@ -309,22 +306,22 @@ export default {
 	},
 	computed: {
 		AlertNonServiceableZipHeader(){
-			let zip = this.serviceZip ? this.serviceZip : this.customerQuestions.addressQuestions.zip;
-			let text = this.getCmsContent("AlertNonServiceableZipWidget", "HeadlineText").replaceAll("{custom:serviceZip}", zip);
+			const zip = this.serviceZip ? this.serviceZip : this.customerQuestions.addressQuestions.zip;
+			const text = this.getCmsContent("AlertNonServiceableZipWidget", "HeadlineText").replaceAll("{custom:serviceZip}", zip);
 			return text;
 		},
 		AlertNonServiceableZipBody(){
 			return this.getCmsContent("AlertNonServiceableZipWidget", "BodyText");
 		},		
 		AlertMatchedDifferentVehicleHeader(){
-			let text = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "HeadlineText").replaceAll("{custom:glassText}", getDamageString());
+			const text = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "HeadlineText").replaceAll("{custom:glassText}", getDamageString());
 			return text;
 		},
 		AlertMatchedDifferentVehicleBody(){
 			let content = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "BodyText");
 			content = content.replaceAll("{custom:glassText}", getDamageString());
-			let vinYmmFound = `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`;
-			let vinYmmExpected = `${store.getters.vehicle.year} ${store.getters.vehicle.make} ${store.getters.vehicle.model}`;   
+			const vinYmmFound = `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`;
+			const vinYmmExpected = `${store.getters.vehicle.year} ${store.getters.vehicle.make} ${store.getters.vehicle.model}`;   
 
 			content = content.replaceAll("{custom:vinYmmFound}", vinYmmFound); 
 			content = content.replaceAll("{custom:vinYmmExpected}", vinYmmExpected); 			
@@ -347,8 +344,7 @@ export default {
 				// if they modify the service zip, then hide the error message”
 				this.displayNonServiceableZipAlert = false;
 			},
-		}
-
+		},
 	},
 	components: {
 		funnelHeader,
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 5380a3fa7..5e966e326 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -15,6 +15,7 @@ const navigationScenarios = {
   CONTINUING_WITH_MULTIPLE_PARTS: "CONTINUING_WITH_MULTIPLE_PARTS",
   CONTINUING_WITH_SINGLE_PART: "CONTINUING_WITH_SINGLE_PART",
   CONTINUING_WITH_MULTIPLE_VEHICLES: "CONTINUING_WITH_MULTIPLE_VEHICLES",
+  CONTINUING_WITH_DIFFERENT_GLASS: "CONTINUING_WITH_DIFFERENT_GLASS",
   TEMPORARY_TO_ADDRESS_LOOKUP: "TEMPORARY_TO_ADDRESS_LOOKUP",
 };
 
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 9f412288a..f2c9aef3d 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -163,7 +163,7 @@ const routingTable = [
         destinationFmgPageValue: fmgPageValues.ADDRESS_VEHICLES,
       },
       {
-        scenario: navigationScenarios.CLICKED_FORWARD,
+        scenario: navigationScenarios.CONTINUING_WITH_DIFFERENT_GLASS,
         destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
       },         
     ],