diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 4394a1da2dc91d21b6c5bd2daca74dc9348c3abe..d7bb675f8b7bbe9d3a7d89e71b27a6dc5ac9a2f4 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -12,7 +12,6 @@
     <entityField>
       <name>ADDRESS</name>
       <title>Street</title>
-      <consumer>StreetValidation</consumer>
       <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="true" />
       <valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess>
@@ -48,7 +47,6 @@
     <entityField>
       <name>CITY</name>
       <title>City</title>
-      <consumer>CityValidation</consumer>
       <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="true" />
       <valueProcess>%aditoprj%/entity/Address_entity/entityfields/city/valueProcess.js</valueProcess>
@@ -86,7 +84,6 @@
     <entityField>
       <name>ZIP</name>
       <title>Postcode</title>
-      <consumer>ZipValidation</consumer>
       <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
       <textInputAllowed v="true" />
       <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/valueProcess.js</valueProcess>
diff --git a/entity/Address_entity/entityfields/address/displayValueProcess.js b/entity/Address_entity/entityfields/address/displayValueProcess.js
index 10012b6d85bef52b735c75233b6149f866b3c12a..18985f7a004b046c160746de13e8970eb6c87ece 100644
--- a/entity/Address_entity/entityfields/address/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/address/displayValueProcess.js
@@ -2,4 +2,5 @@ import("system.vars");
 import("system.result");
 
 // Needed for instant refresh if set by neon.setFieldValue
-result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
+// use the code if address webservice is active
+//result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address/onValueChange.js b/entity/Address_entity/entityfields/address/onValueChange.js
index c19e660f1099559c1b027aba2317e52eee3e6495..abec5ca7ea53495f6a64fbb7eee7ed6fa3f53b25 100644
--- a/entity/Address_entity/entityfields/address/onValueChange.js
+++ b/entity/Address_entity/entityfields/address/onValueChange.js
@@ -1,4 +1,5 @@
 import("system.vars");
 import("WsValidation_lib");
 
-WsValidationUtils.setAddressFields(vars.get("$local.value"));
\ No newline at end of file
+// use the code if address webservice is active
+//WsValidationUtils.setAddressFields(vars.get("$local.value"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address/valueProcess.js b/entity/Address_entity/entityfields/address/valueProcess.js
index e5e514c90862ca236702c6dabc10e44ddaa4d1e5..2c9d496185be419f31c762709ca97d83a1ae4bd4 100644
--- a/entity/Address_entity/entityfields/address/valueProcess.js
+++ b/entity/Address_entity/entityfields/address/valueProcess.js
@@ -2,4 +2,5 @@ import("system.result");
 import("WsValidation_lib");
 import("system.vars");
 
-result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
+// use the code if address webservice is active
+//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/city/displayValueProcess.js b/entity/Address_entity/entityfields/city/displayValueProcess.js
index 60c162e2025d8c553422a6e077c591dd837187cb..0738ded17951195fb9050da641ec78c256a3ee38 100644
--- a/entity/Address_entity/entityfields/city/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/city/displayValueProcess.js
@@ -2,4 +2,5 @@ import("system.vars");
 import("system.result");
 
 // Needed for instant refresh if set by neon.setFieldValue
-result.string(vars.get("$field.CITY"));
\ No newline at end of file
+// use the code if address webservice is active
+//result.string(vars.get("$field.CITY"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/city/onValueChange.js b/entity/Address_entity/entityfields/city/onValueChange.js
index c19e660f1099559c1b027aba2317e52eee3e6495..abec5ca7ea53495f6a64fbb7eee7ed6fa3f53b25 100644
--- a/entity/Address_entity/entityfields/city/onValueChange.js
+++ b/entity/Address_entity/entityfields/city/onValueChange.js
@@ -1,4 +1,5 @@
 import("system.vars");
 import("WsValidation_lib");
 
-WsValidationUtils.setAddressFields(vars.get("$local.value"));
\ No newline at end of file
+// use the code if address webservice is active
+//WsValidationUtils.setAddressFields(vars.get("$local.value"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/city/valueProcess.js b/entity/Address_entity/entityfields/city/valueProcess.js
index e5e514c90862ca236702c6dabc10e44ddaa4d1e5..2c9d496185be419f31c762709ca97d83a1ae4bd4 100644
--- a/entity/Address_entity/entityfields/city/valueProcess.js
+++ b/entity/Address_entity/entityfields/city/valueProcess.js
@@ -2,4 +2,5 @@ import("system.result");
 import("WsValidation_lib");
 import("system.vars");
 
-result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
+// use the code if address webservice is active
+//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zip/displayValueProcess.js b/entity/Address_entity/entityfields/zip/displayValueProcess.js
index bb62a2e6ba7cd75da9a04529fe0b98b4e0f0b13f..219ae2ffc092fe47ebcd3b427c2c4f28052cd0d4 100644
--- a/entity/Address_entity/entityfields/zip/displayValueProcess.js
+++ b/entity/Address_entity/entityfields/zip/displayValueProcess.js
@@ -2,4 +2,5 @@ import("system.vars");
 import("system.result");
 
 // Needed for instant refresh if set by neon.setFieldValue
-result.string(vars.get("$field.ZIP"));
\ No newline at end of file
+// use the code if address webservice is active
+//result.string(vars.get("$field.ZIP"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zip/onValueChange.js b/entity/Address_entity/entityfields/zip/onValueChange.js
index c19e660f1099559c1b027aba2317e52eee3e6495..abec5ca7ea53495f6a64fbb7eee7ed6fa3f53b25 100644
--- a/entity/Address_entity/entityfields/zip/onValueChange.js
+++ b/entity/Address_entity/entityfields/zip/onValueChange.js
@@ -1,4 +1,5 @@
 import("system.vars");
 import("WsValidation_lib");
 
-WsValidationUtils.setAddressFields(vars.get("$local.value"));
\ No newline at end of file
+// use the code if address webservice is active
+//WsValidationUtils.setAddressFields(vars.get("$local.value"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zip/valueProcess.js b/entity/Address_entity/entityfields/zip/valueProcess.js
index 86705dc47362b571c2cfb30d66c8fd05f3f08ef4..92c7fae75dc7a1b51668e4685fe75ed5d197a85b 100644
--- a/entity/Address_entity/entityfields/zip/valueProcess.js
+++ b/entity/Address_entity/entityfields/zip/valueProcess.js
@@ -2,4 +2,5 @@ import("system.vars");
 import("system.result");
 import("WsValidation_lib");
 
-result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
+// use the code if address webservice is active
+//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file