diff --git a/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js b/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/addressid/valueProcess.js b/entity/Address_entity/entityfields/addressid/valueProcess.js
index 6cca32f779e9805f1a780ca58e4147e51ddc5ae8..ddcf55571cd189d2bf5b0da9714f00b3d19da192 100644
--- a/entity/Address_entity/entityfields/addressid/valueProcess.js
+++ b/entity/Address_entity/entityfields/addressid/valueProcess.js
@@ -3,6 +3,7 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 7e0c6abd260e50c2900bb4da742fbf585ee67fe4..7dc6d3ee532cb4eb89d9fbbf2bd7e148882ca831 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -273,8 +273,6 @@
       <title>Charts</title>
       <dependency>
         <name>dependency</name>
-        <entityName>CampaignCostChart_entity</entityName>
-        <fieldName>CostChart</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Communication_entity/entityfields/communicationid/valueProcess.js b/entity/Communication_entity/entityfields/communicationid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/Communication_entity/entityfields/communicationid/valueProcess.js
+++ b/entity/Communication_entity/entityfields/communicationid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/contractid/valueProcess.js b/entity/Contract_entity/entityfields/contractid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/Contract_entity/entityfields/contractid/valueProcess.js
+++ b/entity/Contract_entity/entityfields/contractid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
index a2378ee42b3638db13001b2890b78669e5c65d9e..10c60ad094014a75c4a8baa7464624b65e4817f1 100644
--- a/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/KeywordCategory_entity/entityfields/ab_keyword_categoryid/valueProcess.js b/entity/KeywordCategory_entity/entityfields/ab_keyword_categoryid/valueProcess.js
index ad93cec3bf8be83cc92959219f4f810752413b7d..cd3d2877ed5a1bef204427e5d61d3657be21608a 100644
--- a/entity/KeywordCategory_entity/entityfields/ab_keyword_categoryid/valueProcess.js
+++ b/entity/KeywordCategory_entity/entityfields/ab_keyword_categoryid/valueProcess.js
@@ -4,6 +4,7 @@ import("system.util");
 import("system.vars");
 
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null) {
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
     result.string(util.getNewUUID());
 }
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index 97b8ff6f214851a906f1b612b6a4ab69cf5e482e..12296888c160a75de8460aab170f8690be843c52 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -88,8 +88,6 @@
       <name>Contacts</name>
       <dependency>
         <name>dependency</name>
-        <entityName>Person_entity</entityName>
-        <fieldName>IdFilteredActiveContacts</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/ObjectProxy_entity/ObjectProxy_entity.aod b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
index 1e633cfb90637ff024ff9356586b2a7a3a9cda52..dc4c9ca8367dfc0a3cfad58aa04f1e29f7c95653 100644
--- a/entity/ObjectProxy_entity/ObjectProxy_entity.aod
+++ b/entity/ObjectProxy_entity/ObjectProxy_entity.aod
@@ -128,8 +128,6 @@
       <name>Bulkmails</name>
       <dependency>
         <name>dependency</name>
-        <entityName>BulkMail_entity</entityName>
-        <fieldName>#PROVIDER</fieldName>
       </dependency>
     </entityConsumer>
     <entityConsumer>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index c6ea3d5685761beaf8e5f242438c75b7b6b4b9fe..fed9cd1990ac9c870ed91b402500ac74b2cc04fb 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -224,8 +224,6 @@
       <name>AnyContacts</name>
       <dependency>
         <name>dependency</name>
-        <entityName>AnyContact_entity</entityName>
-        <fieldName>OnlySameCompany</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js b/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 52f23b22af4c514748e990d5ec4e339cee9df71c..fd853436cbfdabab15ee5ad4dc06f2f5ae71f27e 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -461,8 +461,6 @@
       <name>KeywordOrderTypes</name>
       <dependency>
         <name>dependency</name>
-        <entityName>KeywordEntry_entity</entityName>
-        <fieldName>SpecificContainerKeywords</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Order_entity/entityfields/salesorderid/valueProcess.js b/entity/Order_entity/entityfields/salesorderid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/Order_entity/entityfields/salesorderid/valueProcess.js
+++ b/entity/Order_entity/entityfields/salesorderid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/organisationid/valueProcess.js b/entity/Organisation_entity/entityfields/organisationid/valueProcess.js
index 056f5c94f173d94976edc1ce66ca20d57ecfb0ea..2f2038a392ead49738f56f41ee304f0d5e5d10b4 100644
--- a/entity/Organisation_entity/entityfields/organisationid/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/organisationid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.result");
 import("system.neon");
 import("system.util");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/personid/valueProcess.js b/entity/Person_entity/entityfields/personid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..293bbaf03442ce3edfc5c3cbc0c09953b8f935c9 100644
--- a/entity/Person_entity/entityfields/personid/valueProcess.js
+++ b/entity/Person_entity/entityfields/personid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/organisation_id/valueProcess.js b/entity/QuickEntry_entity/entityfields/organisation_id/valueProcess.js
index 24b4e1750592c7cc17e62f913cab93d8dc62934e..663cf5f6581f5cfd96408a4a7b7109550cbf0ff4 100644
--- a/entity/QuickEntry_entity/entityfields/organisation_id/valueProcess.js
+++ b/entity/QuickEntry_entity/entityfields/organisation_id/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.util");
 import("system.result");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/person_contact_id/valueProcess.js b/entity/QuickEntry_entity/entityfields/person_contact_id/valueProcess.js
index 24b4e1750592c7cc17e62f913cab93d8dc62934e..663cf5f6581f5cfd96408a4a7b7109550cbf0ff4 100644
--- a/entity/QuickEntry_entity/entityfields/person_contact_id/valueProcess.js
+++ b/entity/QuickEntry_entity/entityfields/person_contact_id/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.util");
 import("system.result");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/person_id/valueProcess.js b/entity/QuickEntry_entity/entityfields/person_id/valueProcess.js
index 24b4e1750592c7cc17e62f913cab93d8dc62934e..363f6bcdd85145923d42471b7c2ca6fddcc3b602 100644
--- a/entity/QuickEntry_entity/entityfields/person_id/valueProcess.js
+++ b/entity/QuickEntry_entity/entityfields/person_id/valueProcess.js
@@ -3,5 +3,8 @@ import("system.vars");
 import("system.util");
 import("system.result");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
+    
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js
+++ b/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Salutation_entity/entityfields/salutationid/valueProcess.js b/entity/Salutation_entity/entityfields/salutationid/valueProcess.js
index b00a74fd01954b6aeac70538fa243fd7a99aa335..885ed2edec421395ccaf52b1fc5620995a85fcf0 100644
--- a/entity/Salutation_entity/entityfields/salutationid/valueProcess.js
+++ b/entity/Salutation_entity/entityfields/salutationid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.neon");
 import("system.result");
 import("system.vars");
 
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file
diff --git a/entity/Stock_entity/entityfields/stockid/valueProcess.js b/entity/Stock_entity/entityfields/stockid/valueProcess.js
index 86ef789e064a4016f2d12c432498dc23474807aa..823247cf893e603a8e2b8d5725d6b94ecd975695 100644
--- a/entity/Stock_entity/entityfields/stockid/valueProcess.js
+++ b/entity/Stock_entity/entityfields/stockid/valueProcess.js
@@ -3,5 +3,7 @@ import("system.vars");
 import("system.result");
 import("system.neon");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-    result.string(util.getNewUUID());
\ No newline at end of file
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+{
+    result.string(util.getNewUUID());
+}
\ No newline at end of file