diff --git a/front/core/components/address-autocomplete/index.html b/front/core/components/address-autocomplete/index.html
index bbe2ded1c7..7b34aee896 100755
--- a/front/core/components/address-autocomplete/index.html
+++ b/front/core/components/address-autocomplete/index.html
@@ -1,10 +1,10 @@
 <vn-crud-model
+    vn-id="getLocations"
     auto-load="true"
     url="Postcodes/location"
     data="$ctrl.locations"
     order="code">
 </vn-crud-model>
-{{$ctrl.postCode}}
 <vn-autocomplete
     vn-two
     vn-id="location"
@@ -12,17 +12,16 @@
     vn-name="location"
     ng-model="$ctrl.postCode"
     data="$ctrl.locations"
-    selection="$ctrl.selection"
     show-field="name"
     value-field="id">
     <tpl-item class="address">
         <span>
-            {{::name}}
+            {{name}}
         </span>
     </tpl-item>
     <append>
         <vn-icon-button
-            ui-sref="postcode.open()"
+            ng-click="$event.preventDefault(); postcode.open()"
             icon="add_circle"
             vn-tooltip="New postcode">
         </vn-icon-button>
diff --git a/front/core/components/address-autocomplete/index.js b/front/core/components/address-autocomplete/index.js
index b68fb5ce23..43893b007b 100755
--- a/front/core/components/address-autocomplete/index.js
+++ b/front/core/components/address-autocomplete/index.js
@@ -57,6 +57,13 @@ export default class AddressAutocomplete extends Component {
         this.country = selection.countryFk;
         this.countryName = selection.countryName;
     }
+
+    async onResponse(response) {
+        await this.$.getLocations.refresh();
+        this.postCode = response.code;
+        // :TODO refesh displayed
+        this.$.location.refreshDisplayed();
+    }
 }
 
 ngModule.vnComponent('vnAddressAutocomplete', {