diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index ff7e6a8d8..89a31d454 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -551,23 +551,21 @@ export default {
         },
         async setupPia() {
             this.$refs.loadingModal.showModal();
-
-            // if we don't have a work order in delete substatus, set the flag and submit.
             // we need a work order number for pia so we can pass it to safeliteHop.
-            if (!store.getters.order.workOrderNumber) {
-                try {
-                    await submitWorkOrder({
-                        pageNameToLog: "payment-method",
-                        submitAfterSave: false,
-                        createDeleteStatusWorkOrderForPia: true,
-                    });
-                } catch (error) {
-                    console.log("error: response from pia submit work order:" + error.message);
-                    this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-                    this.$route.query[queryStrings.DISPLAY_PIA_ALERT] = true;
-                    return;
-                }
+            // this will create one in delete substatus.
+            try {
+                await submitWorkOrder({
+                    pageNameToLog: "payment-method",
+                    submitAfterSave: false,
+                    createDeleteStatusWorkOrderForPia: true,
+                });
+            } catch (error) {
+                console.log("error: response from pia submit work order:" + error.message);
+                this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
+                this.$route.query[queryStrings.DISPLAY_PIA_ALERT] = true;
+                return;
             }
+
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_PAY_NOW,
@@ -594,7 +592,9 @@ export default {
             );
         },
         shouldHideRecalibration() {
-            return this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE);
+            return (
+                this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE).toLowerCase() === "true"
+            );
         },
         showApplePay() {
             return baseMixin.methods.showApplePay();
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 34efac1a1..a60eb4aff 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -213,7 +213,7 @@ export default {
                 const supportingItemsPromise = await this.dispatchStoreActionWithLogging(
                     storeActions.GET_SUPPORTING_ITEMS,
                     null,
-                    "estimate"
+                    "service-zip"
                 );
 
                 const promiseResultMap = [
@@ -232,7 +232,7 @@ export default {
                 );
 
                 // call saveSession here - navigateWithSaving saves too late in the flow
-                await saveSession({ pageNameToLog: "estimate" });
+                await saveSession({ pageNameToLog: "service-zip" });
                 return this.$router.navigateWithSaving(
                     this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
                     this.$route