diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 86bcfeea..7d74278f 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -201,27 +201,10 @@ export default {
             evt.stopPropagation();
             evt.preventDefault();
 
-            const input = document.getElementById(evt.srcElement.id);
-            const originalValue = input.value;
-            const startPosition = input.selectionStart;
-            const endPosition = input.selectionEnd;
-            const selectionLength = endPosition - startPosition;
+            const data = evt.type === 'paste' ? (evt.clipboardData || window.clipboardData) : evt.dataTransfer;
+            const value = data.getData('Text')?.trim();
 
-            let data = null;
-            if (evt.type === 'paste') {
-                data = evt.clipboardData || window.clipboardData;
-            } else {
-                data = evt.dataTransfer;
-            }
-
-            const textValue = data.getData('Text');
-
-            // Insert the pasted/dropped string at the index position
-            const arrOriginalString = originalValue.split('');
-            arrOriginalString.splice(startPosition, selectionLength, textValue);
-            const blendedString = arrOriginalString.join('');
-
-            this.$emit('update:modelValue', blendedString);
+            this.$emit('update:modelValue', this.modelValue + value);
         },
         clickedSearch() {
             if (this.meta.valid) {
diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue
index 41d80dc6..be446bde 100644
--- a/src/layouts/tpa-search/tpa-search.vue
+++ b/src/layouts/tpa-search/tpa-search.vue
@@ -31,83 +31,83 @@
                                 :includeSearchIcon="true"
                                 :displayQuestionText="false"
                                 isRequired
+                                :isDisabled="reloadingProviders"
                                 :validationRules="rules.zipCode"
                                 @clickEvent="searchClick" />
                         </div>
                     </div>
                 </div>
             </Form>
-            <div>
-                <googleMap
-                    id="map"
-                    class="mb-4"
-                    :addresses="providerAddresses"
-                    :zipCode="mapZipCode"></googleMap>
-                <Form
-                    id="providerSelectionForm"
-                    v-slot="{ meta }"
-                    @submit="onSubmit"
-                    @invalidSubmit="onInvalidSubmit">
-                    <div class="container-fluid pb-2">
-                        <div class="mx-5">
-                            <dropdownQuestion
-                                id="searchRadiusFilter"
-                                v-model="filter"
-                                :cmsWidgetName="widget.filterByQuestion"
-                                inputId="filterByQuestionField"
-                                :options="filterOptions"
-                                disableAutoFill
-                                :validationRules="rules.filter" />
-                            <loader
-                                v-if="reloadingProviders"
-                                id="providersLoader"
-                                loaderPosition="center"
-                                loaderColor="blue"
-                                :width="2"
-                                :height="2"
-                                class="my-4" />
-                            <div v-else>
-                                <div class="my-4">
-                                    <buttonQuestion
-                                        id="selectProviderQuestion"
-                                        v-model="selectedProviderNumber"
-                                        buttonTypeString="shopListButton"
-                                        :buttonTypeObject="shopListButton"
-                                        class="radioQuestion"
-                                        :answers="providerButtonData"
-                                        groupName="chooseShop"
-                                        textPosition="text-start"
-                                        isRequired
-                                        :validationRules="rules.provider"
-                                        :additionalButtonData="additionalButtonData" />
-                                    <alert
-                                        v-if="providers?.length === 0 ?? true"
-                                        id="alertNoNetworkProviders"
-                                        :cmsWidgetName="widget.noNetworkShopsAlert"
-                                        alertClass="alert-warning"
-                                        :isDismissible="false"
-                                        :manualHeadline="noNetworkShopsAlertHeaderText" />
-                                </div>
-                                <div
-                                    class="text-center">
-                                    <textLink
-                                        id="preferredShopNotListedLink"
-                                        linkType="navigation"
-                                        href="#!"
-                                        :text="shopNotListedModalLink"
-                                        @clickEvent="doNotSeeMyShopLinkClick" />
-                                </div>
+            <googleMap
+                id="map"
+                class="mb-4"
+                :addresses="providerAddresses"
+                :zipCode="mapZipCode"></googleMap>
+            <Form
+                id="providerSelectionForm"
+                v-slot="{ meta }"
+                @submit="onSubmit"
+                @invalidSubmit="onInvalidSubmit">
+                <div class="container-fluid pb-2">
+                    <div class="mx-5">
+                        <dropdownQuestion
+                            id="searchRadiusFilter"
+                            v-model="filter"
+                            :cmsWidgetName="widget.filterByQuestion"
+                            inputId="filterByQuestionField"
+                            :options="filterOptions"
+                            disableAutoFill
+                            :isDisabled="reloadingProviders"
+                            :validationRules="rules.filter" />
+                        <loader
+                            v-if="reloadingProviders"
+                            id="providersLoader"
+                            loaderPosition="center"
+                            loaderColor="blue"
+                            :width="2"
+                            :height="2"
+                            class="my-4" />
+                        <div v-else>
+                            <div class="my-4">
+                                <buttonQuestion
+                                    id="selectProviderQuestion"
+                                    v-model="selectedProviderNumber"
+                                    buttonTypeString="shopListButton"
+                                    :buttonTypeObject="shopListButton"
+                                    class="radioQuestion"
+                                    :answers="providerButtonData"
+                                    groupName="chooseShop"
+                                    textPosition="text-start"
+                                    isRequired
+                                    :validationRules="rules.provider"
+                                    :additionalButtonData="additionalButtonData" />
+                                <alert
+                                    v-if="providers?.length === 0 ?? true"
+                                    id="alertNoNetworkProviders"
+                                    :cmsWidgetName="widget.noNetworkShopsAlert"
+                                    alertClass="alert-warning"
+                                    :isDismissible="false"
+                                    :manualHeadline="noNetworkShopsAlertHeaderText" />
+                            </div>
+                            <div
+                                class="text-center">
+                                <textLink
+                                    id="preferredShopNotListedLink"
+                                    linkType="navigation"
+                                    href="#!"
+                                    :text="shopNotListedModalLink"
+                                    @clickEvent="doNotSeeMyShopLinkClick" />
                             </div>
                         </div>
-                        <siteFooter
-                            ref="siteFooter"
-                            :cmsWidgetName="widget.siteFooter"
-                            :isForwardActionDisabled="!meta.valid"
-                            @ForwardClicked="forwardButtonAction"
-                            @backClicked="backButtonAction" />
                     </div>
-                </Form>
-            </div>
+                    <siteFooter
+                        ref="siteFooter"
+                        :cmsWidgetName="widget.siteFooter"
+                        :isForwardActionDisabled="!meta.valid"
+                        @ForwardClicked="forwardButtonAction"
+                        @backClicked="backButtonAction" />
+                </div>
+            </Form>
         </div>
     </div>
 </template>