diff --git a/src/fmg-components/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue
index a0cc50f43..3e0eadbc1 100644
--- a/src/fmg-components/address-questions/address-questions.vue
+++ b/src/fmg-components/address-questions/address-questions.vue
@@ -293,23 +293,20 @@ export default {
             this.addressField1.addEventListener("input", (e) => {
                 // console.log(`input event`);
                 // console.log(e);
+                console.log("input")
+                switch (e.inputType) {
+                    case "insertText":
+                    case "insertFromPaste":
+                    case "deleteContentBackward":
+                        // If the user enters text by typing, or pasting text, or deleting text already entered, disable *autofill*
+                        this.disableAutoFill();
+                        break;
+                    default:
+                        this.matchFound = true;
+                        this.addressField1.classList.remove("has-icon");
+                }
 
-                this.$nextTick(() => {
-                    switch (e.inputType) {
-                        case "insertText":
-                        case "insertFromPaste":
-                        case "deleteContentBackward":
-                            // If the user enters text by typing, or pasting text, or deleting text already entered, disable *autofill*
-                            this.disableAutoFill();
-                            break;
-                        default:
-                            // If the user enters text by *autofill* then disable the *autocomplete*
-                            this.showAddressFields = true;
-                            this.addressField1.classList.remove("has-icon");
-                            //this.addressField1.dispatchEvent(new Event("change"))
-                            this.unloadAutocomplete();
-                    }
-                });
+                
             });
         },
         disableAutoFill() {
@@ -443,7 +440,7 @@ export default {
         },
     },
     mounted() {
-        // If we already have a full address, show it
+        //If we already have a full address, show it
         this.showAddressFields =
             (this.addressModel.streetAddress ?? "") !== "" &&
             (this.addressModel.city ?? "") !== "" &&
@@ -527,10 +524,22 @@ export default {
                         },
                         { deep: true, flush: "post" }
                     );
+                } else {
+                    this.showAddressFields = true;
+                    this.addressField1.classList.remove("has-icon");
                 }
             },
             deep: true,
         },
+        // addressModel: {
+        //     handler(newValue) {
+        //         this.$nextTick(() => {
+        //             this.showAddressFields = true;              
+        //         })
+                
+        //     },
+        //     deep: true
+        // }
     },
     components: {
         textboxQuestion,