diff --git a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
index dfeca41ef02f14a11b63195199fb2cb04ab582d1..30447fcdaaed381f42f4fb23397cb01fd934c0ca 100644
--- a/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
+++ b/entity/WorkflowDefinition_entity/WorkflowDefinition_entity.aod
@@ -31,6 +31,7 @@
       <name>ISACTIVE</name>
       <title>Active</title>
       <contentType>BOOLEAN</contentType>
+      <dropDownProcess>%aditoprj%/entity/WorkflowDefinition_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
     </entityField>
     <entityField>
       <name>FILEUPLOAD</name>
@@ -51,6 +52,7 @@
     <entityField>
       <name>VERSION</name>
       <title>Version</title>
+      <state>READONLY</state>
     </entityField>
     <entityField>
       <name>NAME</name>
@@ -73,6 +75,7 @@
       <isFilterable v="true" />
       <contentProcess>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <onInsert>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onUpdate>%aditoprj%/entity/WorkflowDefinition_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
diff --git a/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js b/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js
index 7d8f58e356d1b5b125e191e7ff32c7f5ee45eb0a..4ce7a3f7fca4a214d2bc64f51e25a0d988b57825 100644
--- a/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js
+++ b/entity/WorkflowDefinition_entity/entityfields/diagram/valueProcess.js
@@ -3,5 +3,5 @@ import("system.result");
 import("system.neon");
 import("system.workflow");
 
-if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET)
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
     result.string(workflow.getProcessDiagram(vars.get("$field.UID")));
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/entityfields/isactive/dropDownProcess.js b/entity/WorkflowDefinition_entity/entityfields/isactive/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a5eec56c41ae0c48e898c88e9a5f81ab17c043af
--- /dev/null
+++ b/entity/WorkflowDefinition_entity/entityfields/isactive/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+    ["true", translate.text("Yes")],
+    ["false", translate.text("No")]
+]);
\ No newline at end of file
diff --git a/entity/WorkflowDefinition_entity/recordcontainers/jdito/onUpdate.js b/entity/WorkflowDefinition_entity/recordcontainers/jdito/onUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..23cf24a9afc3929332e325e886188762ceae6fdd
--- /dev/null
+++ b/entity/WorkflowDefinition_entity/recordcontainers/jdito/onUpdate.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.workflow");
+
+if (vars.get("$local.changed"))
+var rowdata = vars.get("$local.rowdata");
diff --git a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
index 492ca5a5c69390554504949a4b8aaae0cc1819c5..3015fe118607630cddd274a4011c7a0b9824f5e3 100644
--- a/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
+++ b/entity/WorkflowInstance_entity/WorkflowInstance_entity.aod
@@ -31,6 +31,7 @@
   <recordContainers>
     <jDitoRecordContainer>
       <name>jdito</name>
+      <contentProcess>%aditoprj%/entity/WorkflowInstance_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
diff --git a/entity/WorkflowInstance_entity/recordcontainers/jdito/contentProcess.js b/entity/WorkflowInstance_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..221a1a8737b426e17a726256f27c5ac1cfa79af5
--- /dev/null
+++ b/entity/WorkflowInstance_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.workflow");
+
+var workflowDefId = vars.get("$param.WorkflowDefinitionId_param");
+var loadConfig = workflow.createConfigForLoadingProcessInstances()
+    .processDefinitionId(workflowDefId);
+var wfInstances = workflow.getProcessInstances(loadConfig);
\ No newline at end of file
diff --git a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
index 98ff813a0dc0166eda9efdfd60c191dcb026daa2..855a0bceb7409eaad0bc68a60336f50a3134720c 100644
--- a/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
+++ b/neonView/WorkflowDefinitionPreview_view/WorkflowDefinitionPreview_view.aod
@@ -14,5 +14,20 @@
       <subtitleField>CATEGORY</subtitleField>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <showDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>9ae7bada-afb2-48d4-9aa0-b2bd5bd17379</name>
+          <entityField>ISACTIVE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>d31118d7-fc96-4126-80f5-4336da434170</name>
+          <entityField>VERSION</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
   </children>
 </neonView>