diff --git a/src/iss-components/address-questions/address-questions.vue b/src/iss-components/address-questions/address-questions.vue
index 57b9d0dc..8ab07362 100644
--- a/src/iss-components/address-questions/address-questions.vue
+++ b/src/iss-components/address-questions/address-questions.vue
@@ -13,7 +13,7 @@
                     disableAutoFill
                     validationRules="street-address-required"
                     @keydown.enter.prevent
-                    @focusout="fillInAddress()" />
+                    @focusout="onAutocompleteFocusOut()" />
             </div>
         </div>
         <transition
@@ -280,6 +280,9 @@ export default {
                 self.displayVerificationWarning = self.matchingIndirectly;
             });
         },
+        onAutocompleteFocusOut() {
+            this.showAllFields = true;
+        },
         fillInAddressUsingFirstItem() {
             const addressValue = this.addressField1.value;
             if (addressValue && addressValue.length > 0) {
diff --git a/src/layouts/bailout-page/bailout-page.vue b/src/layouts/bailout-page/bailout-page.vue
index 692837e1..a6921804 100644
--- a/src/layouts/bailout-page/bailout-page.vue
+++ b/src/layouts/bailout-page/bailout-page.vue
@@ -193,6 +193,9 @@ export default {
         }
     },
     methods: {
+        arePagePrerequisitesValid() {
+            return !!this.mainStore.pageData(issPageValues.BAILOUT_PAGE);
+        },
         backButtonAction() {
             // route to move backwards
             this.mainStore.resetBailout();
diff --git a/src/layouts/policy-holder-details/policy-holder-details.vue b/src/layouts/policy-holder-details/policy-holder-details.vue
index 2758f64f..165fb775 100644
--- a/src/layouts/policy-holder-details/policy-holder-details.vue
+++ b/src/layouts/policy-holder-details/policy-holder-details.vue
@@ -19,7 +19,7 @@
                         id="address-questions-wrapper"
                         ref="addressQuestions"
                         v-model="customerQuestions.addressQuestions"
-                        includeStreetAddress2="true" />
+                        :includeStreetAddress2="true" />
                     <textboxQuestion
                         ref="policyHolderFirstName"
                         v-model="customerQuestions.firstName"
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index f469953d..2f8f4d0f 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -119,7 +119,6 @@ export default {
             vin,
             forwardButtonCarStyle: '',
             vinPopulatedOnPageLoad: vin?.length > 0 && this.hasValidCarId(),
-            hasBailedOut: false
         };
     },
     computed: {
@@ -231,13 +230,12 @@ export default {
 
                 this.needToLookupVehicle = false;
 
-                return null;
+                return;
             }
 
             let isSelectedGlassAvailableForVehicle = true;
             if (this.isCarIdDifferentFromTheStore) {
-                isSelectedGlassAvailableForVehicle =
-                    await isGlassAvailableForCarId(this.vehicleFromLookup.carId);
+                isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(this.vehicleFromLookup.carId);
             }
 
             // navigate back to vehicle-damage
@@ -255,7 +253,7 @@ export default {
                 );
 
                 // navigate() doesn't stop the processing flow
-                return null;
+                return;
             }
 
             // save vehicle to store if it hasn't already been saved
@@ -268,28 +266,23 @@ export default {
                     this.navigationScenarios.CORRECTED_VIN_FROM_POLICY_VEHICLE,
                     this.$route
                 );
-                return null;
+                return;
             }
 
             const partsOrQuestionsResponse = await this.getPartsOrQuestions();
             if (partsOrQuestionsResponse.error) {
                 this.mainStore.setBailout(bailoutMessage.PartsServiceError(partsOrQuestionsResponse.error.data));
                 window.console.error('Error on retrieving PartsOrQuestions');
-                this.$refs.siteFooter.removeLoader();
-                this.hasBailedOut = true;
+                // this.$refs.siteFooter.removeLoader();
                 this.$router.navigate(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_BAILOUT,
                     this.$route
                 );
+                return;
             }
 
             // Comes from vehicleQuestionsMixin.navigateForward()
-            if (!this.hasBailedOut) {
-                await this.navigateForward(
-                    partsOrQuestionsResponse.data.partsOrQuestions,
-                    this
-                );
-            }
+            await this.navigateForward(partsOrQuestionsResponse.data.partsOrQuestions, this);
         },
         async lookupVehicleByVin(vin) {
             try {