diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 8a7f46bae..de907a237 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -389,14 +389,13 @@ export default {
                 ) {
                     return true;
                 } else {
-                    console.log(
-                        "ins: servce-location invalid prereq:" +
-                            store.getters.payment.parentAccountNumber +
-                            ":" +
-                            store.getters.order.policy.policyNumber +
-                            ":" +
-                            store.getters.order.serviceLocation.zipCode
-                    );
+                    // prettier-ignore
+                    {
+                        console.log(new Date() + "Insurance: servce-location invalid prereqs");
+                        console.log(new Date() + "store.getters.payment.parentAccountNumber:" + store.getters.payment.parentAccountNumber);
+                        console.log(new Date() + "store.getters.order.policy.policyNumber:" + store.getters.order.policy.policyNumber);
+                        console.log(new Date() + "store.getters.order.serviceLocation.zipCode:" + store.getters.order.serviceLocation.zipCode);
+                    }
                     return false;
                 }
             } else {
@@ -406,12 +405,12 @@ export default {
                 ) {
                     return true;
                 } else {
-                    console.log(
-                        "cash: servce-location invalid prereq:" +
-                            JSON.stringify(store.getters.lineItems.supportingItems) +
-                            ":" +
-                            store.getters.order.serviceLocation.zipCode
-                    );
+                    // prettier-ignore
+                    {
+                        console.log(new Date() + "Cash: servce-location invalid prereqs");
+                        console.log(new Date() + "store.getters.lineItems.supportingItems:" + JSON.stringify(store.getters.lineItems.supportingItems));
+                        console.log(new Date() + "store.getters.order.serviceLocation.zipCode:" + store.getters.order.serviceLocation.zipCode);
+                    }                    
                     return false;
                 }
             }
diff --git a/src/router/index.js b/src/router/index.js
index a3584b442..9fac41bb0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -113,8 +113,10 @@ const routes = [
                             to.query.fmgPage
                         );
 
-                        //Update external parameter state
-                        updateExternalParameterState();
+                        //Update external parameter state but not when returning from heritage
+                        if (!to.query.fmgPage?.startsWith("service-location")) {
+                            updateExternalParameterState();
+                        }
 
                         // clear part related state because heritage selected a new vehicle
                         if (