diff --git a/src/fmg-components/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
index 73bc6936d..cc1768c27 100644
--- a/src/fmg-components/address-questions/address-questions.vue
+++ b/src/fmg-components/address-questions/address-questions.vue
@@ -2,12 +2,13 @@
     <div class="address-questions">
         <div class="row mb-4" aria-live="polite">
             <div class="col">
+                <!-- Temporarily changing id from autocomplete to streetAddress -->
                 <textboxQuestion
                     id="streetAddressField"
                     cmsWidgetName="StreetAddressQuestionWidget"
                     v-model="addressModel.streetAddress"
                     ref="autocomplete"
-                    customInputId="autocomplete"
+                    customInputId="streetAddress"
                     placeholderText="Search"
                     aria-haspopup=""
                     hasIcon
@@ -207,7 +208,7 @@ export default {
         },
         addressField1: {
             get: function () {
-                return document.getElementById("autocomplete");
+                return document.getElementById("streetAddress");
             },
         },
         isTouchDevice: {
@@ -293,6 +294,7 @@ export default {
             this.addressField1.addEventListener("input", (e) => {
                 // console.log(`input event`);
                 // console.log(e);
+                const self = this;
                 console.log("input");
                 switch (e.inputType) {
                     case "insertText":
@@ -302,8 +304,11 @@ export default {
                         this.disableAutoFill();
                         break;
                     default:
-                        this.matchFound = true;
-                        this.addressField1.classList.remove("has-icon");
+                        this.$nextTick(() => {
+                            self.matchFound = true;
+                        });
+                    //this.matchFound = true;
+                    //this.addressField1.classList.remove("has-icon");
                 }
             });
         },
@@ -526,6 +531,7 @@ export default {
                     this.showAddressFields = true;
                     this.addressField1.classList.remove("has-icon");
                 }
+                console.log("match found watch");
             },
             deep: true,
         },