diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index b4af4dc2..05e50102 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -12,7 +12,7 @@
                 ref="vehicleBanner"
                 :displayGenericVehicleImage="false" />
             <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" ref="siteSubHeader" />
-            <div class="fade-on-route-transition sub-container make-tall">
+            <div class="fade-on-route-transition sub-container make-tall overflow-auto">
                 <alert
                     ref="alertVinNotFound"
                     v-if="displayVinNotFoundAlert"
diff --git a/src/store/index.js b/src/store/index.js
index 68861c05..cc05bf84 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -311,8 +311,8 @@ export const useMainStore = defineStore({
       },
 
       async getParts() {
-        const vehicle = this.getters.vehicle;
-        const damage = this.getters.damage;
+        const vehicle = this.order.vehicle;
+        const damage = this.order.damage;
         const order = this.order;
 
         const carId = vehicle.carId;
@@ -602,7 +602,7 @@ export const useMainStore = defineStore({
       savePartQuestionAnswers(partQuestionAnswersArray) {
         // if part question answers have changed, reset subsequent question answers
         const sortedPreviousResultsArray = sortArrayOfObjectsByPropertyValue(
-            context.getters.damage.partQuestionAnswers,
+            this.order.damage.partQuestionAnswers,
             "result"
         );
         const sortedPartQuestionAnswersArray = sortArrayOfObjectsByPropertyValue(