diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 6260df9d1..dc846f377 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -70,8 +70,6 @@ export default {
             handler(newValue) {
                 if (newValue) {
                     this.selectedValues = "Mobile";
-                } else {
-                    this.selectedValues = null;
                 }
             },
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 56cb88d80..6dce8e985 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -71,7 +71,7 @@
                 :isDropoff="isDropoff"
                 :serviceZipCode="zipCode"
                 :selectedAppointmentType="selectedAppointmentType"
-                :shopQuestionInitialData="shopQuestionInitialData"
+                :shopQuestionData="shopQuestionData"
                 cmsWidgetName="ShopQuestionWidget" />
             <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
             <funnel-footer
@@ -145,9 +145,9 @@ export default {
             isRecalibrationServiceableMobile: null,
             mobileFeePart: null,
             zipContainsMilitaryBase: false,
-            selectedAppointmentType: "",
+            selectedAppointmentType: "Dropoff",
             providerNumber: null,
-            shopQuestionInitialData: null,
+            shopQuestionData: null,
             selectedShop: "",
         };
     },
@@ -162,7 +162,7 @@ export default {
 
         const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
 
-        const shopQuestionInitialDataPromise = shopQuestion.methods.loadInitialData();
+        const shopQuestionDataPromise = shopQuestion.methods.loadData();
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -183,8 +183,8 @@ export default {
                 promise: getZipCodeData,
             },
             {
-                resultKey: "shopQuestionInitialData",
-                promise: shopQuestionInitialDataPromise,
+                resultKey: "shopQuestionData",
+                promise: shopQuestionDataPromise,
             },
         ];
 
@@ -197,7 +197,7 @@ export default {
                 resultMap.zipCodeData,
                 resultMap.serviceabilityDetails,
                 resultMap.mobileFeePart,
-                resultMap.shopQuestionInitialData
+                resultMap.shopQuestionData
             );
         });
     },
@@ -308,7 +308,7 @@ export default {
                 store.getters.payment.isInsurance !== null
             );
         },
-        setData(zipCodeData, serviceabilityDetails, mobileFeePart, shopQuestionInitialData) {
+        setData(zipCodeData, serviceabilityDetails, mobileFeePart, shopQuestionData) {
             if (zipCodeData) {
                 this.zipContainsMilitaryBase = zipCodeData.containsMilitaryBase;
             }
@@ -321,8 +321,8 @@ export default {
                 this.mobileFeePart = mobileFeePart;
             }
 
-            if (shopQuestionInitialData) {
-                this.shopQuestionInitialData = shopQuestionInitialData;
+            if (shopQuestionData) {
+                this.shopQuestionData = shopQuestionData;
             }
         },
         setContainsMilitaryBase(val) {
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index 34441440d..3f8a892f9 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -71,7 +71,7 @@ export default {
         serviceZipCode: String,
         selectedAppointmentType: String,
         cmsWidgetName: String,
-        shopQuestionInitialData: {
+        shopQuestionData: {
             type: Object,
             required: true,
         },
@@ -102,7 +102,7 @@ export default {
         },
     },
     methods: {
-        loadInitialData() {
+        loadData() {
             return baseMixin.methods.dispatchStoreAction(storeActions.GET_PROVIDER_LOCATIONS, {
                 serviceZipCode: this.serviceZipCode,
             });
@@ -162,12 +162,17 @@ export default {
             this.shopIndex = 0;
             this.getNextShopsFromList();
 
-            this.displaySeeMoreLocationsLink = true;            
+            this.displaySeeMoreLocationsLink = true;
             this.selectedValue = "";
             this.$refs.buttonQuestion.resetField();
-
         },
     },
+    mounted() {
+        console.log(this.shopQuestionData)
+        this.shops = this.shopQuestionData;
+        this.getNextShopsFromList()
+        console.log(this.shops)
+    },
     watch: {
         serviceZipCode: {
             async handler() {
@@ -177,7 +182,7 @@ export default {
         selectedAppointmentType: {
             async handler(newValue, oldValue) {
                 if (oldValue == undefined) {
-                    this.shops = this.shopQuestionInitialData;
+                    this.shops = this.shopQuestionData;
                     this.getNextShopsFromList();
                     this.displaySeeMoreLocationsLink = true;
                     return;
@@ -192,7 +197,6 @@ export default {
 
                 this.resetShopList();
             },
-            immediate: true,
         },
     },
 };