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 0cc56663a..1d5ea4501 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -111,15 +111,14 @@ export default {
     mixins: [baseMixin],
     data() {
         return {
-            internalModel: this.copyModel(this.modelValue),
+            internalModel: this.copyModel(this.modelValue), // zip refactor
             answers: [],
             shopListButton: shopListButton,
             shopIndex: 0,
-            localShopProviderData: this.shopProviderData,
-            selectedProviderNumber: null,
-            isLoadingShops: false,
-            lastSearchedZip: "",
-            lastSuccessfulZip: "",
+            localShopProviderData: this.shopProviderData, // Why does parent manage this sometimes, but not all of the time
+            selectedProviderNumber: null, // Revisit this, maybe not too hard
+            lastSearchedZip: "",  // zip refactor
+            lastSuccessfulZip: "", // zip refactor
             displayInvalidZipAlert: false,
             displayNoShopsAlert: false,
         };
@@ -368,21 +367,17 @@ export default {
         updateShopsForZip(zipCode) {
             if (!this.appointmentType) {
                 this.answers = [];
-                this.isLoadingShops = false;
                 return;
             }
             this.lastSearchedZip = zipCode;
             if (!zipCode) {
-                this.isLoadingShops = false;
                 this.answers = [];
                 return;
             }
-            this.isLoadingShops = true;
             if (!zipCode || !this.shopProviders.length) {
                 this.answers = [];
                 this.displayNoShopsAlert = true;
                 this.displaySeeMoreLocationsLink = false;
-                this.isLoadingShops = false;
                 return;
             }
 
@@ -441,7 +436,6 @@ export default {
             if (mappedData.length > 0) {
                 this.lastSuccessfulZip = zipCode;
             }
-            this.isLoadingShops = false;
             this.displayNoShopsAlert = this.answers.length === 0;
         },
         resetModalButtonStyle() {