diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index e6b66d4e6..f2799d7be 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -188,6 +188,8 @@ export default {
         insuranceCompanyName: String,
         showInsuranceCoverageAs: String,
         shouldHideRecalibration: Boolean,
+        isItac: Boolean,
+        isNoComp: Boolean,
     },
     data() {
         return {
@@ -1007,8 +1009,13 @@ export default {
         },
         salesTax() {
             if (!this.lineItems || this.lineItems.length < 1) return;
-            
-            if (this.isInsurance && !this.showCoverageAsVerified) {
+
+            if (
+                this.isInsurance &&
+                !this.showCoverageAsVerified &&
+                !this.isItac &&
+                !this.isNoComp
+            ) {
                 return 0;
             }
 
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 6106e4008..9f8cee9ec 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -34,7 +34,9 @@
                         :insuranceDeductible="currentDeductible"
                         :insuranceCompanyName="insuranceCompanyName"
                         :showInsuranceCoverageAs="showInsuranceCoverageAs"
-                        :shouldHideRecalibration="shouldHideRecalibration" />
+                        :shouldHideRecalibration="shouldHideRecalibration"
+                        :isItac="isItac"
+                        :isNocomp="isNocomp" />
 
                     <hr class="my-5" />
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index cfd51dc8b..6b67561ec 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -337,17 +337,10 @@ export default {
                 experimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_INTERNAL
             );
 
-            if (!store.getters.externalParameterState?.isExternalParameter) {
-                // there are no external parameters
+            const isExternalParameter = store.getters.externalParameterState?.isExternalParameter;
 
-                if (internalThreshold) thresholdToUse = internalThreshold;
-                vm.isInsuranceSelected = getIsInsuranceSelectedValue(
-                    vm.availableLineItems,
-                    thresholdToUse
-                );
-                baseMixin.methods.ResetExternalParamsAndHideModal();
-            } else {
-                // there ARE external parameters
+            if (isExternalParameter !== undefined) {
+                // user is from an external source (either has value or is null)
 
                 if (store.getters.externalParameterQuote.isInsurance == true) {
                     // did user intentionally select insurance?
@@ -361,26 +354,26 @@ export default {
                         baseMixin.methods.ResetExternalParamsAndHideModal();
                     }
                 } else {
-                    // did user come from external source (LeadGen)?
-                    let externalSource = store.getters.externalParameterSource
-                        ? store.getters.externalParameterSource
-                        : null;
+                    const externalThreshold = experimentMixin.methods.getSettingValue(
+                        experimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL
+                    );
+                    thresholdToUse = externalThreshold;
 
-                    // Business logic to determine what "external" source is
-                    if (externalSource?.includes("LeadGen")) {
-                        const externalThreshold = experimentMixin.methods.getSettingValue(
-                            experimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL
-                        );
-                        if (externalThreshold) thresholdToUse = externalThreshold;
-                    } else {
-                        if (internalThreshold) thresholdToUse = internalThreshold;
-                    }
                     vm.isInsuranceSelected = getIsInsuranceSelectedValue(
                         vm.availableLineItems,
                         thresholdToUse
                     );
                     baseMixin.methods.ResetExternalParamsAndHideModal();
                 }
+            } else {
+                // there are no external parameters; use internal threshold
+                if (internalThreshold) thresholdToUse = internalThreshold;
+
+                vm.isInsuranceSelected = getIsInsuranceSelectedValue(
+                    vm.availableLineItems,
+                    thresholdToUse
+                );
+                baseMixin.methods.ResetExternalParamsAndHideModal();
             }
         });
     },
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index d77a7eb04..08509eb40 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -167,7 +167,10 @@ export default {
             if (logFirstShopsDisplayed) {
                 gaAction = this.GaActions.SHOPS_FIRST_DISPLAYED;
             }
-            if (this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP) {
+            if (
+                this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP ||
+                this.selectedAppointmentType === AppointmentTypeStrings.DROP_OFF
+            ) {
                 var shops = mappedData.map((shop) => {
                     if (shop.value.length > 5 && shop.value.startsWith("00")) {
                         return shop.value.substring(1);
diff --git a/src/store/index.js b/src/store/index.js
index 29289db6e..c89e04a14 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -476,10 +476,6 @@ export const mutations = {
         externalParameterState.quote.servicePackage = servicePackage;
         saveExternalParameterState(externalParameterState);
     },
-    updateExternalParameterSource(state, source) {
-        externalParameterState.source = source;
-        saveExternalParameterState(externalParameterState);
-    },
     //RESET ExternalParameter MUTATIONS
     resetExternalParameterVehicleState(state) {
         externalParameterState.vehicle.year = null;
@@ -510,10 +506,6 @@ export const mutations = {
         externalParameterState.quote.servicePackage = null;
         saveExternalParameterState(externalParameterState);
     },
-    resetExternalParameterSourceState(state) {
-        externalParameterState.source = null;
-        saveExternalParameterState(externalParameterState);
-    },
     resetIsExternalParameter(state) {
         externalParameterState.isExternalParameter = null;
         saveExternalParameterState(externalParameterState);
@@ -936,7 +928,7 @@ export const getters = {
     externalParameterQuote: (state) => externalParameterState?.quote,
     externalParameterServiceZip: (state) => externalParameterState?.serviceZip,
     externalParameterEstimate: (state) => externalParameterState?.estimate,
-    externalParameterSource: (state) => externalParameterState?.source,
+    isExternalParameter: (state) => externalParameterState?.isExternalParameter,
 };
 
 function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {
@@ -2929,7 +2921,6 @@ export const actions = {
             context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_ESTIMATE_STATE);
             context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_SERVICEZIP_STATE);
             context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_QUOTE_STATE);
-            context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_SOURCE_STATE);
             context.commit(storeMutations.RESET_IS_EXTERNAL_PARAMETER);
         }
     },
@@ -3450,7 +3441,6 @@ async function resetScheduleIfUnavailable(context, order, pageNameToLog) {
 function createExternalParameterDefaultState() {
     // create default externalParameter state
     const externalParameterDefaultState = {
-        isExternalParameter: null,
         vehicle: {
             year: null,
             make: null,
@@ -3473,7 +3463,6 @@ function createExternalParameterDefaultState() {
             isInsurance: null,
             servicePackage: null,
         },
-        source: null,
     };
     // set to session storage
     saveExternalParameterState(externalParameterDefaultState);