diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 5309f40eb97ebb58b7769e2c12e6b28f2fd2c24f..dc74f4716b87e075d26e2926315c508bdf77726c 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -7,7 +7,9 @@
   <title>Classification</title>
   <grantUpdateProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantUpdateProcess.js</grantUpdateProcess>
   <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
+  <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
   <iconId>VAADIN:LIST_OL</iconId>
+  <iconIdProcess>%aditoprj%/entity/ClassificationAdmin_entity/iconIdProcess.js</iconIdProcess>
   <titlePlural>Classifications</titlePlural>
   <recordContainer>jDito</recordContainer>
   <entityFields>
diff --git a/entity/ClassificationAdmin_entity/contentTitleProcess.js b/entity/ClassificationAdmin_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9cedc1b443b456616494927893d95f000ee5532c
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/contentTitleProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+
+var objectType = vars.get("$field.OBJECT_TYPE.displayValue");
+var classificationGroupTitle = vars.get("$field.CLASSIFICATIONGROUP.displayValue");
+var classificationTypeTitle = vars.get("$field.CLASSIFICATIONTYPEID.displayValue");
+
+var res = objectType || classificationGroupTitle || classificationTypeTitle || "";
+
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
index 163b952b7230f5054874557333c9639947c0a158..45336b55ef94109330b4bc6ec35aebcf28a1a83b 100644
--- a/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/target_context/valueProcess.js
@@ -3,14 +3,22 @@ import("Classification_lib");
 import("system.result");
 import("system.vars");
 
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0)
+var cat = vars.get("$field.recordCategory");
+var res;
+switch (cat) 
 {
-    var value = vars.get("$field.CLASSIFICATION_PARENT_ID");
-    
-    res = ClassificationUtils.decode(value)
-    if(res)
-        result.string(res);
+    case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_TYPE():
+        res = "ClassificationType";
+        break;
+    case $ClassificationRecordCategories.CLASSIFICATION_CLASSIFICATION_GROUP():
+        res = "ClassificationGroup";
+        break;
+    case $ClassificationRecordCategories.CLASSIFICATION_OBJECT_TYPE():
+        res = "ClassificationGroup";
+        break;
+    default:
+        res = "";
+        break;
 }
 
+result.string(res);
\ No newline at end of file
diff --git a/entity/ClassificationAdmin_entity/iconIdProcess.js b/entity/ClassificationAdmin_entity/iconIdProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b69514355bf1fe9a366c719bfd2ac7c430bd2b
--- /dev/null
+++ b/entity/ClassificationAdmin_entity/iconIdProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string("TEXT:" + vars.get("$field.#CONTENTTITLE"));
\ No newline at end of file
diff --git a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
index 0fd065096d7a63abf690e5285a66a56c2a4d3478..616066188353b8e65c14944886f0d9e36692ef62 100644
--- a/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
+++ b/neonView/ClassificationAdminFilter_view/ClassificationAdminFilter_view.aod
@@ -18,16 +18,8 @@
       <fixedFilterFields />
       <columns>
         <neonTreeTableColumn>
-          <name>825a461f-65a1-4483-ae97-655b1f87bc0a</name>
-          <entityField>OBJECT_TYPE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>4d53ba6d-f0a0-4f04-afaa-3278a45cce86</name>
-          <entityField>CLASSIFICATIONGROUP</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>299d5ef1-31a5-47d2-ae41-573e05a0b6c7</name>
-          <entityField>CLASSIFICATIONTYPEID</entityField>
+          <name>2e04e92e-9af8-46a6-9845-8bf822cd05f3</name>
+          <entityField>#CONTENTTITLE</entityField>
         </neonTreeTableColumn>
       </columns>
     </treeTableViewTemplate>