diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 0b30faaa7..7e42d4b85 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -55,7 +55,7 @@ const value = computed({
 });
 
 onMounted(() => {
-    locationFilter()
+    locationFilter($props.modelValue);
 });
 
 function setOptions(data) {
@@ -69,34 +69,39 @@ watch(options, (newValue) => {
 });
 
 function showLabel(data) {
-       return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-function locationFilter(search) {
+function locationFilter(search = '') {
+    if (
+        search &&
+        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
+    )
+        return;
     let where = { search };
-    postcodesRef.value.fetch({filter:{ where}, limit: 30});
+    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
 }
 
-function handleFetch( data) {
+function handleFetch(data) {
     postcodesOptions.value = data;
 }
-
 </script>
 <template>
     <FetchData
         ref="postcodesRef"
         url="Postcodes/filter"
-        @on-fetch="(data) =>handleFetch(data)"
+        @on-fetch="(data) => handleFetch(data)"
     />
     <VnSelectCreate
         v-if="postcodesRef"
+        :option-label="(opt) => showLabel(opt) ?? 'code'"
+        :option-value="(opt) => opt.code"
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        :option-label="showLabel"
         :placeholder="t('Search by postalCode, town, province or country')"
         @input-value="locationFilter"
-        :default-filter="false"
+        :default-filter="true"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
@@ -110,7 +115,7 @@ function handleFetch( data) {
         <template #form>
             <CreateNewPostcode @on-data-saved="locationFilter()" />
         </template>
-        <template #option="{itemProps, opt}">
+        <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index fe0ecee68..a332be449 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -1,31 +1,64 @@
-const inputLocation = ':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
 const locationOptions ='[role="listbox"] > div.q-virtual-scroll__content > .q-item'
 describe('VnLocation', () => {
-    beforeEach(() => {
-        cy.viewport(1280, 720);
-        cy.login('developer');
-        cy.visit('/#/worker/create');
-        cy.waitForElement('.q-card');
-    });
+    // describe('Create',()=>{
+    //     const inputLocation = ':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+    //     beforeEach(() => {
+    //         cy.viewport(1280, 720);
+    //         cy.login('developer');
+    //         cy.visit('/#/worker/create');
+    //         cy.waitForElement('.q-card');
+    //     });
 
-    it('Show all options', function() {
-      cy.get(inputLocation).click();
-      cy.get(locationOptions).should('have.length',5);
-    });
+    //     it('Show all options', function() {
+    //     cy.get(inputLocation).click();
+    //     cy.get(locationOptions).should('have.length',5);
+    //     });
 
-    it('input filter location as "al"', function() {
-        cy.get(inputLocation).click();
-        cy.get(inputLocation).clear();
-        cy.get(inputLocation).type('al');
-        cy.get(locationOptions).should('have.length',3);
-    });
-    it('input filter location as "ecuador"', function() {
-        cy.get(inputLocation).click();
-        cy.get(inputLocation).clear();
-        cy.get(inputLocation).type('ecuador');
-        cy.get(locationOptions).should('have.length',1);
-        cy.get(`${locationOptions}:nth-child(1)`).click();
-        cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click();
+    //     it('input filter location as "al"', function() {
+    //         cy.get(inputLocation).click();
+    //         cy.get(inputLocation).clear();
+    //         cy.get(inputLocation).type('al');
+    //         cy.get(locationOptions).should('have.length',3);
+    //     });
+    //     it('input filter location as "ecuador"', function() {
+    //         cy.get(inputLocation).click();
+    //         cy.get(inputLocation).clear();
+    //         cy.get(inputLocation).type('ecuador');
+    //         cy.get(locationOptions).should('have.length',1);
+    //         cy.get(`${locationOptions}:nth-child(1)`).click();
+    //         cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click();
 
+    //     });
+    // });
+    describe('Fiscal-data',()=>{
+    const inputLocation = ':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('/#/supplier/567/fiscal-data', {timeout: 2000});
+            cy.waitForElement('.q-card');
+        });
+
+        it('Show all options', function() {
+        // cy.get(inputLocation).click();
+        // cy.get(locationOptions).should('have.length',5);
+        // });
+
+        // it('input filter location as "al"', function() {
+        //     cy.get(inputLocation).click();
+        //     cy.get(inputLocation).clear();
+        //     cy.get(inputLocation).type('al');
+        //     cy.get(locationOptions).should('have.length',3);
+        // });
+        // it('input filter location as "ecuador"', function() {
+            cy.get(inputLocation).click();
+            // cy.get(inputLocation).clear();
+            // cy.get(inputLocation).type('ecuador');
+            cy.get(locationOptions).should('have.length',1);
+            // cy.get(`${locationOptions}:nth-child(1)`).click();
+            // cy.get(':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input').should('have.text','46600')
+
+        });
     });
 })