relation in CONTRACT with lookup

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>

entity/Contract_entity/entityfields/relation_id/displayValueProcess.js

 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

entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js

+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

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>