diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 8a47d4270d19c851b77b44b229437d32408437b5..94fa83392d10f1d9bf1b51085d4c4f8e91069b19 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -106,6 +106,9 @@
       <possibleItemsProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/possibleItemsProcess.js</possibleItemsProcess>
       <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
       <onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+      </onValueChangeTypes>
     </entityField>
     <entityParameter>
       <name>Keyword_param</name>
diff --git a/entity/Document_entity/entityfields/is_main_document/onValueChange.js b/entity/Document_entity/entityfields/is_main_document/onValueChange.js
index ae0c7fd54f1cadee5dc8c3fa65eac926b0e5dc68..9b24b45926f8c5a61e02a09fcdfbb1a1dcb4de76 100644
--- a/entity/Document_entity/entityfields/is_main_document/onValueChange.js
+++ b/entity/Document_entity/entityfields/is_main_document/onValueChange.js
@@ -1,7 +1,11 @@
 import("system.neon");
 import("system.vars");
+import("Entity_lib");
 
-if(vars.get("$local.value") == '1')
+var value = vars.exists("$field.IS_MAIN_DOCUMENT") ? vars.get("$field.IS_MAIN_DOCUMENT") : "";
+value = ProcessHandlingUtils.getOnValidationValue(value);
+
+if(value == "1")
     neon.setFieldValue("$field.KEYWORD", "MAINDOCUMENT");
-else
+else if(value == "0")
     neon.setFieldValue("$field.KEYWORD", "");
\ No newline at end of file
diff --git a/entity/Document_entity/entityfields/is_main_document/valueProcess.js b/entity/Document_entity/entityfields/is_main_document/valueProcess.js
index c0ce3fb192de3f9abc755b82305c5060cf6a9569..044f5d99f80a775c390b772a5d8e1cf875c87479 100644
--- a/entity/Document_entity/entityfields/is_main_document/valueProcess.js
+++ b/entity/Document_entity/entityfields/is_main_document/valueProcess.js
@@ -1,9 +1,7 @@
 import("system.vars");
 import("system.result");
-var res = '0';
 
-if(vars.get("$field.KEYWORD") == 'MAINDOCUMENT') {
-    res = '1';
-}
-
-result.string(res);
\ No newline at end of file
+if(vars.get("$field.KEYWORD") == 'MAINDOCUMENT')
+    result.string("1");
+else
+    result.string("0");
\ No newline at end of file
diff --git a/neonView/DocumentFilter_view/DocumentFilter_view.aod b/neonView/DocumentFilter_view/DocumentFilter_view.aod
index bfa86562b90fa107d859a88d5b6ef1eaa6cb0f5d..ff3fd20bc7a5528037453ab3c9896bb21d50df34 100644
--- a/neonView/DocumentFilter_view/DocumentFilter_view.aod
+++ b/neonView/DocumentFilter_view/DocumentFilter_view.aod
@@ -38,6 +38,10 @@
           <width v="75" />
           <expandRatio v="100" />
         </neonTableColumn>
+        <neonTableColumn>
+          <name>0f7279fa-612b-4f2b-90aa-9de8efd1d3fb</name>
+          <entityField>IS_MAIN_DOCUMENT</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>