diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 88493b2d733ec4ae70d71fff3be91705f859c57a..e0908b3c1d9ae9fed4d93d9825b95639dde7e2a8 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -128,10 +128,6 @@
           <name>OBJECT_TYPE.value</name>
           <recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ROWID.displayValue</name>
-          <expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_NEW.value</name>
           <recordfield>ACTIVITYLINK.USER_NEW</recordfield>
diff --git a/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
deleted file mode 100644
index 33554680cccd2c3d363443686457c41e0c1c5729..0000000000000000000000000000000000000000
--- a/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/value/valueProcess.js
index 938b26f2b636941ca480c11525662c41bf43cc57..de16168406809a55e948202dfa404b94a65a2377 100644
--- a/entity/AttributeRelation_entity/entityfields/value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/value/valueProcess.js
@@ -5,5 +5,5 @@ import("system.result");
 
 var attributeType = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
 var contentType = AttributeTypeUtil.getContentType(attributeType);
-if (vars.get("$this.value") == null && contentType == "BOOLEAN")
+if (!vars.get("$this.value") && contentType == "BOOLEAN")
     result.string("0");
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index b005433286432d702748a9a2c7b25569a376d7ee..29cf6bde033ad9e91f4231e41516ea448bf58939 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -16,18 +16,21 @@
       <resolution>DAY</resolution>
       <outputFormat>dd.MM.yyyy</outputFormat>
       <inputFormat>dd.MM.yyyy</inputFormat>
+      <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/date_start/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>GROUPCODE</name>
       <title>Product</title>
       <consumer>KeywordProductGroupcodes</consumer>
+      <mandatory v="true" />
       <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
       <name>INFO</name>
       <title>Info</title>
       <contentType>LONG_TEXT</contentType>
+      <mandatory v="true" />
     </entityField>
     <entityField>
       <name>FORECASTID</name>
@@ -47,6 +50,7 @@
     <entityField>
       <name>VOLUME</name>
       <title>Volume</title>
+      <mandatory v="true" />
       <titleProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/titleProcess.js</titleProcess>
     </entityField>
     <entityConsumer>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 72cb3ae67b966d244ef38188f8c50894a79b47ec..b8ffe707c0f328b863e7c12b5de3aa7ae9cc3500 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -115,10 +115,6 @@
           <name>TASKLINKID.value</name>
           <recordfield>TASKLINK.TASKLINKID</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>OBJECT_ROWID.displayValue</name>
-          <expression>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js b/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
index 9f4a7f9bd3974a260e541cb3c176cc77310d1a30..ffa5fdc842418a835f0d6c5bf05a8630abefeb77 100644
--- a/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
@@ -1,11 +1,15 @@
+import("system.logging");
 import("system.neon");
 import("system.vars");
 import("system.db");
 import("system.result");
 import("Context_lib");
 
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
-    result.string("");
-}else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
+logging.log(JSON.stringify(vars.get("$field.OBJECT_ROWID"), null, "\t"))
+logging.log(JSON.stringify(vars.get("$field.OBJECT_TYPE"), null, "\t"))
+
+if(vars.get("$field.OBJECT_ROWID") && vars.get("$field.OBJECT_TYPE"))
+{
+    logging.log(JSON.stringify(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))), null, "\t"))
     result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
 }
\ No newline at end of file
diff --git a/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
deleted file mode 100644
index 33554680cccd2c3d363443686457c41e0c1c5729..0000000000000000000000000000000000000000
--- a/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file