diff --git a/entity/Comm_entity/Comm_entity.aod b/entity/Comm_entity/Comm_entity.aod
index 3841980aa55fea829857d7bbb6f38a46cc2d229b..c8e8ab8a1280bd4d3acf578d04f850279cff51b7 100644
--- a/entity/Comm_entity/Comm_entity.aod
+++ b/entity/Comm_entity/Comm_entity.aod
@@ -41,7 +41,6 @@
       <columnName>MEDIUM_ID</columnName>
       <caption>Medium</caption>
       <possibleItemsProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
-      <valueMappingProcess>%aditoprj%/entity/Comm_entity/entityfields/medium_id/valueMappingProcess.js</valueMappingProcess>
     </entityField>
     <entityField>
       <name>RELATION_ID</name>
@@ -72,48 +71,6 @@
       <description>This parameter is used for specifing a related &amp;quot;RELATIONID&amp;quot; to a COMM-entry. 
 Usually this is used for filtering COMM-entires by a specified contact or creating a new entry that is related to a contact.</description>
     </entityParameter>
-    <entityIncomingField>
-      <name>PersComm_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>b509cb67-6306-4f74-8ce8-0385052a9611</name>
-          <entityName>Pers_entity</entityName>
-          <fieldName>PersComm_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>6bee4be4-34bd-47fc-a909-8e8bbf2f45f2</name>
-          <entityName>Pers_entity</entityName>
-          <fieldName>PersCommPhone_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>89ff88fa-029f-4b0d-a358-b7b310a6e72c</name>
-          <entityName>Pers_entity</entityName>
-          <fieldName>PersCommOthers_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-        <entityDependency>
-          <name>90c0436e-3a46-40ec-ae73-b4aaded95bbc</name>
-          <entityName>Pers_entity</entityName>
-          <fieldName>PersCommEmail_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityIncomingField>
-    <entityIncomingField>
-      <name>OrgComm_dfi</name>
-      <fieldType>DEPENDENCY_IN</fieldType>
-      <dependencies>
-        <entityDependency>
-          <name>09723d40-72bc-4fcd-8283-fe085de73330</name>
-          <entityName>Org_entity</entityName>
-          <fieldName>OrgComm_dfo</fieldName>
-          <isOutgoing v="false" />
-        </entityDependency>
-      </dependencies>
-    </entityIncomingField>
     <entityField>
       <name>IS_STANDARD</name>
       <contentType>BOOLEAN</contentType>
@@ -127,6 +84,9 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
 So, for only showing telephone-types you&amp;apos;ve to specify this parameter with it&amp;apos;s phone-number-category.
 </description>
     </entityParameter>
+    <entityIncomingField>
+      <name>#INCOMING</name>
+    </entityIncomingField>
   </entityFields>
   <linkInformation>
     <linkInformation>
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index a25d34b1f522f29e604a9a3332c58ac4c048e212..a4ccd58638b6113155858bf0a0da147a20cfe1d1 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -240,7 +240,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Comm_entity</entityName>
-        <fieldName>OrgComm_dfi</fieldName>
+        <fieldName>#INCOMING</fieldName>
       </dependency>
       <children>
         <entityParameter>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 3bde50426e7df363af3df0c628a7579347165569..e9215647ece9b25a589bfab2f4a27722c134189d 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -225,7 +225,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Comm_entity</entityName>
-        <fieldName>PersComm_dfi</fieldName>
+        <fieldName>#INCOMING</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -290,7 +290,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Comm_entity</entityName>
-        <fieldName>PersComm_dfi</fieldName>
+        <fieldName>#INCOMING</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -310,7 +310,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Comm_entity</entityName>
-        <fieldName>PersComm_dfi</fieldName>
+        <fieldName>#INCOMING</fieldName>
       </dependency>
       <children>
         <entityParameter>
@@ -330,7 +330,7 @@
       <dependency>
         <name>dependency</name>
         <entityName>Comm_entity</entityName>
-        <fieldName>PersComm_dfi</fieldName>
+        <fieldName>#INCOMING</fieldName>
       </dependency>
       <children>
         <entityParameter>