diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 4020533a27ac61b3d6bdeaf5450f340ffde8ec18..9545557dab0134b0a0178a0d567c427a4b5c2fc4 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -234,15 +234,6 @@
         </entityParameter>
       </children>
     </entityOutgoingField>
-    <entityField>
-      <name>ORG_NAME</name>
-    </entityField>
-    <entityField>
-      <name>PERS_FIRSTNAME</name>
-    </entityField>
-    <entityField>
-      <name>PERS_LASTNAME</name>
-    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
diff --git a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js b/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
index 1d6c953ad45250176239347bfb47c63724df807f..5159f2ac23951196460df8dea03ebbd65be479f8 100644
--- a/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
+++ b/entity/Contract_entity/entityfields/relation_id/displayValueProcess.js
@@ -1,9 +1,6 @@
 import("system.result");
 import("system.vars");
 import("Relation_lib");
+import("system.neon");
 
-result.string(RelationUtils.getNameByPersOrg("$field.RELATION_PERS_ID", 
-                                             "$field.RELATION_ORG_ID", 
-                                             "$field.PERS_FIRSTNAME", 
-                                             "$field.PERS_LASTNAME",
-                                             "$field.ORG_NAME"));
\ No newline at end of file
+result.string(RelationUtils.getNameByPersOrgWithRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
diff --git a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
index 57c48f6133bf10c2d3165c27a2aa3b97af6520af..2c8672f45309b0e7948787e30a5e7da698a515e0 100644
--- a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
+++ b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js
@@ -1,5 +1,5 @@
+import("system.vars");
 import("system.result");
 import("Relation_lib");
 
-result.string(RelationUtils.getContextByPersOrg("$field.RELATION_PERS_ID", 
-                                                "$field.RELATION_ORG_ID"));
\ No newline at end of file
+result.string(RelationUtils.getContextByRelationId(vars.getString("$field.RELATION_ID")));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 7f49bcbde9941684fe4f8993b05709f0809f024e..8e1eef1663e1e04f322cbd21f6fd8e395cf18890 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -318,15 +318,6 @@
         </entityParameter>
       </children>
     </entityOutgoingField>
-    <entityField>
-      <name>PERS_FIRSTNAME</name>
-    </entityField>
-    <entityField>
-      <name>PERS_LASTNAME</name>
-    </entityField>
-    <entityField>
-      <name>ORG_NAME</name>
-    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>