diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 42ea1b578..a79b2b1f5 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -110,6 +110,7 @@
                         :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
                         :shopProviderDataFromParent="shopProviderData"
                         @shop-selected="onShopSelected"
+                        @updated-serviceability="setServiceabilityDetails"
                         :zipCodeFromParent="zipCode"
                         cmsWidgetName="YourSafeliteShopWidget" />
 
@@ -1307,6 +1308,9 @@ export default {
                 );
             }
         },
+        showLoadingModal() {
+            this.$refs.loadingModal.showModal();
+        },
         async forwardButtonAction() {
             this.navigatingForward = true;
             var ctu = this.zipCodeCtu;
@@ -1434,6 +1438,7 @@ export default {
                     this.pageName
                 );
             }
+            this.showLoadingModal();
         },
         setDisplayWaitList() {
             const dateString = this.isMobileSelected
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 5189a15a4..469344d04 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
@@ -73,7 +73,11 @@ export default {
         },
         selectedValue: {
             get: function () {
-                return this.modelValue;
+                if (this.modelValue === AppointmentTypeStrings.DROP_OFF) {
+                    return AppointmentTypeStrings.IN_SHOP;
+                } else {
+                    return this.modelValue;
+                }
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index df0a185a3..ff3a9f75a 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -307,10 +307,6 @@ export default {
             // I think we should call our new pushGA Event here with new mapped data
         },
         async setZipCodeAndShop() {
-            const selectedProvider = this.shopProviders.find(
-                (provider) => provider.providerNumber == this.localSelectedProviderNumber
-            );
-
             const shopQuestionPopUpData = {
                 zipCodeData: this.zipCodeData,
                 shopProviderData: this.localShopProviderData,
@@ -318,6 +314,17 @@ export default {
             };
             this.$emit("shop-selected", shopQuestionPopUpData);
 
+            if (this.zipCodeData) {
+                // retrieve serviceability details
+                const serviceabilityDetails = await getServiceabilityDetails(
+                    this.zipCodeData.zipCode,
+                    null,
+                    this.pageName
+                );
+
+                this.$emit("updated-serviceability", serviceabilityDetails.data);
+            }
+
             this.closeModal();
         },
     },