diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index bc5034c67..256e09f5c 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -130,6 +130,20 @@ export default {
                 this.parentAccountNumber.toString(),
                 false
             );
+
+            const billToAccountNumber = await baseMixin.methods.dispatchStoreActionWithLogging(
+                storeActions.GET_BILL_TO_ACCOUNT_NUMBER,
+                {},
+                "insurance-company",
+                false
+            );
+
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_BILL_TO_ACCOUNT_NUMBER,
+                billToAccountNumber,
+                false
+            );
+
             navigateToHeritageFunnel({
                 shouldSaveSession: true,
                 pageNameToLog: "insurance-company",
diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue
index 13ae42095..381ff4607 100644
--- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue
+++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue
@@ -8,15 +8,15 @@
                 :aria-label="buttonLabel"
                 class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4">
                 <div class="row-one">
-                    <span class="m-0 button-label-copy" :class="textPosition">{{
+                    <span class="m-0 button-label-copy text-truncate" :class="textPosition">{{
                         buttonLabel
                     }}</span>
-                    <span class="m-0 caption ms-1" :class="textPosition">{{
+                    <span class="m-0 caption mx-1 text-nowrap" :class="textPosition">{{
                         buttonLabelSubCopy
                     }}</span>
                     <div
                         v-if="displayAvailabilityIndicators"
-                        class="availability-indicator rounded-pill"
+                        class="availability-indicator rounded-pill text-nowrap"
                         :class="availabilityRatingClass">
                         <div
                             v-if="!isLoaderDisplayed"