diff --git a/src/common-components/dropdown-question/dropdown-question.spec.js b/src/common-components/dropdown-question/dropdown-question.spec.js
index 249b00710..20bba1712 100644
--- a/src/common-components/dropdown-question/dropdown-question.spec.js
+++ b/src/common-components/dropdown-question/dropdown-question.spec.js
@@ -48,29 +48,6 @@ describe("dropdownQuestion.vue", () => {
         expect(label.text()).toContain(questionText);
     });
 
-    it("Should render the 'questionText' data value with '⁠' after the first character of each word in the label text when disableAutoFill is true.", async () => {
-        // Arrange
-        const wrapper = shallowMount(dropdownQuestion, {
-            propsData: {
-                options: {},
-                disableAutoFill: true,
-            },
-            mixins: [mockMixin],
-        });
-
-        // Mock CMS content ...
-        // Trust me, the below instance of the string "Q⁠uestion Text" actually has the ⁠ in it. You just can't see it
-        // Don't believe me? Copy and paste it into Google. Then inspect the search field element in Dev Tools,
-        // you will see "Q⁠uestion T⁠ext"
-        const expectedQuestionText = "Q⁠uestion T⁠ext";
-
-        // Act
-        const label = wrapper.find("label");
-
-        // Assert
-        expect(label.text()).toContain(expectedQuestionText);
-    });
-
     it("Should return input id as the id of the select field", async () => {
         // Arrange
         const wrapper = shallowMount(dropdownQuestion, {
diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/common-components/dropdown-question/dropdown-question.vue
index 4567994f1..e7c183e49 100644
--- a/src/common-components/dropdown-question/dropdown-question.vue
+++ b/src/common-components/dropdown-question/dropdown-question.vue
@@ -38,7 +38,6 @@ export default {
         },
         isDisabled: Boolean,
         isRequired: Boolean,
-        disableAutoFill: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         hasError: Boolean,
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index 439e2922c..c8d24c57e 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -128,7 +128,7 @@ describe("address-questions.vue", () => {
             expect(wrapper.vm.$loadScript).not.toHaveBeenCalled();
         });
 
-        test("address field is focused => disable autocomplete", async () => {
+        test("address field is focused => disable autofill", async () => {
             // Arrange
             let focusEventCallbackFunction;
             autocompleteElement.addEventListener = jest
diff --git a/src/layouts/capability-questions/capability-questions.spec.js b/src/layouts/capability-questions/capability-questions.spec.js
index f29be44e6..34fb4be05 100644
--- a/src/layouts/capability-questions/capability-questions.spec.js
+++ b/src/layouts/capability-questions/capability-questions.spec.js
@@ -113,6 +113,7 @@ afterEach(() => {
         pageData: baseStoreGettersPageData,
         damage: baseStoreGettersDamage,
         payment: { insuranceCoverage: {} },
+        order: {},
     };
 });
 
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index e2e3cbb07..9387bd89a 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -219,6 +219,8 @@ export default {
                     payment.isInsurance && payment.insuranceCoverage.coverageStatus;
                 if (vehicleChangedDuringPolicyLookupInHeritage) {
                     navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+                } else if (this.$store.getters.order.referralNumber?.length === 6) {
+                    await this.navigateForwardWithSingleCarMatch();
                 } else if (this.isRepair) {
                     return this.$router.navigateWithSaving(
                         this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index a97e14b41..13961df5a 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -107,6 +107,7 @@ const baseStoreGettersDamage = () => {
 store.getters = {
     pageData: baseStoreGettersPageData,
     damage: baseStoreGettersDamage,
+    order: {},
 };
 store.commit = jest.fn();
 
@@ -116,6 +117,7 @@ afterEach(() => {
         pageData: baseStoreGettersPageData,
         damage: baseStoreGettersDamage,
         payment: { insuranceCoverage: {} },
+        order: {},
     };
 });
 
diff --git a/src/layouts/part-questions/part-questions.spec.js b/src/layouts/part-questions/part-questions.spec.js
index 8de000009..3382ec1dc 100644
--- a/src/layouts/part-questions/part-questions.spec.js
+++ b/src/layouts/part-questions/part-questions.spec.js
@@ -97,6 +97,7 @@ const baseStoreGettersDamage = () => {
 store.getters = {
     pageData: baseStoreGettersPageData,
     damage: baseStoreGettersDamage,
+    order: {},
 };
 store.commit = jest.fn();
 
@@ -140,6 +141,7 @@ describe("partQuestions.vue...", () => {
                     };
                 }),
                 damage: baseStoreGettersDamage,
+                order: {},
             };
             const { wrapper } = setupMocks({});
 
@@ -159,6 +161,7 @@ describe("partQuestions.vue...", () => {
             store.getters = {
                 pageData: baseStoreGettersPageData,
                 damage: baseStoreGettersDamage,
+                order: {},
             };
             const { wrapper } = setupMocks({});
             const spy = jest.spyOn(wrapper.vm, "handleCompletedQuestionChainAnswers");
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5eababde5..4cb2dcf55 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -144,7 +144,8 @@ export default {
                 store.getters.order.serviceLocation.zipCodeCtu &&
                 (store.getters.order.damage.isRepair ||
                     (store.getters.order.lineItems?.glassParts != null &&
-                        store.getters.order.lineItems.glassParts.length > 0))
+                        store.getters.order.lineItems.glassParts.length > 0)) &&
+                store.getters.order.referralNumber?.length !== 6
             );
         },
         getDefaultIsInsuranceSelectedValue(availableLineItems) {
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index d14491ccd..23ce3b88a 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -460,6 +460,7 @@ describe("vehicle-parts.vue", () => {
         store.getters.lineItems = { glassParts: {} };
         store.getters.vehicle = { carId: "TEST_CAR_ID" };
         store.getters.payment = { insuranceCoverage: {} };
+        store.getters.order = {};
 
         const { wrapper } = setupMocks({
             mountOptionsMockData: {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 49f291392..3a8fd4657 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -446,7 +446,9 @@ export default {
 
                 const payment = store.getters.payment;
 
-                if (payment.isInsurance && payment.insuranceCoverage.isVerified) {
+                if (store.getters.order.referralNumber?.length === 6) {
+                    navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal });
+                } else if (payment.isInsurance && payment.insuranceCoverage.isVerified) {
                     navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal });
                 } else {
                     self.$router.navigateWithSaving(