diff --git a/entity/KeywordAttribute_entity/documentation.adoc b/entity/KeywordAttribute_entity/documentation.adoc
index decc1751fd305427095b6e74c801feef205c70d6..579af8ea92828573b9e3419af1a5651102a60e03 100644
--- a/entity/KeywordAttribute_entity/documentation.adoc
+++ b/entity/KeywordAttribute_entity/documentation.adoc
@@ -7,4 +7,21 @@ You can specify special attributes per Keyword-container.
 
 It describes which Keyword-Attribute can be set - not which Keyword-Attribute-value is set on which entry.
 
-Do not confuse the Keyword-Attributes with the standard Attributes (-> `Attribute_entity`). While the way it works is similar, the Keyword-Attributes are specifically developed for keywords and provide therefore different functionality.
\ No newline at end of file
+Do not confuse the Keyword-Attributes with the standard Attributes (-> `Attribute_entity`). While the way it works is similar, the Keyword-Attributes are specifically developed for keywords and provide therefore different functionality.
+
+[CAUTION]
+====
+Never delete a Keyword-Attribute that is currently in use - there is no protection on the users side.
+====
+////
+Currently there is no way to protect the record from being deleted by the user.
+(So leave at least some hint)
+////
+
+
+You might ask:
+
+> Why are there no essential Keyword-Attributes?
+
+The reason therefore is: Currently the Keyword-Attributes can only be used by a developer within JDito-Code.
+So there is no need to add, modify, etc. the Keyword-Attributes for an administrator/power-user.
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 0a25a091e6b7dfd0ab1f2c6423bc5e206029f815..f51c8dab46ab46b09a0ddb2d02672fcbf66dc3e6 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -32,6 +32,7 @@
       <name>KEYID</name>
       <title>Key</title>
       <state>READONLY</state>
+      <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
@@ -43,7 +44,8 @@
       <name>SORTING</name>
       <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
       <title>Sorting</title>
-      <state>READONLY</state>
+      <mandatory v="true" />
+      <state>AUTO</state>
     </entityField>
     <entityField>
       <name>ISACTIVE</name>
diff --git a/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js b/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..11f1cb994026398ca6df3cfcffd3157ed05f78f7
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var fieldState;
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    fieldState = neon.COMPONENTSTATE_AUTO;
+else
+    fieldState = neon.COMPONENTSTATE_READONLY;
+
+result.string(fieldState);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js
index b8dafebb3d124fac43eb1bf6d64037083dfae319..e32403dc6e2df5902c3faeaf8f155a3b41a0f405 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js
@@ -4,4 +4,5 @@ import("system.result");
 result.object({
      "AB_KEYWORD_ENTRY.CONTAINER": db.ASCENDING
     ,"AB_KEYWORD_ENTRY.SORTING": db.ASCENDING
+    ,"AB_KEYWORD_ENTRY.TITLE": db.ASCENDING
 });
\ No newline at end of file
diff --git a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
index 58405b852717bfc66e9c1c5d4217268684ca5823..629a4295a16efb0c1ca7db69ba6cc1e1ffcd5586 100644
--- a/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
+++ b/neonView/KeywordAttributeFilter_view/KeywordAttributeFilter_view.aod
@@ -18,6 +18,10 @@
           <name>94fdd272-46f0-415e-aff8-76789a215921</name>
           <entityField>#ICON</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>7efe2ae9-8b76-439f-95cb-547f7dec9057</name>
+          <entityField>CONTAINER</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>682fd08f-b121-469c-b86e-afdf013dbc7b</name>
           <entityField>NAME</entityField>
@@ -26,10 +30,6 @@
           <name>8d142e4d-c15d-409a-9a2c-251192e3e98e</name>
           <entityField>TYPE</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>7efe2ae9-8b76-439f-95cb-547f7dec9057</name>
-          <entityField>CONTAINER</entityField>
-        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
index 5f5e927e380c67da92e94afdfd8fc7d498bf3aba..90a553cbf1ba7105f93e65b1a7626776cbeed7e5 100644
--- a/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
+++ b/neonView/KeywordEntryEdit_view/KeywordEntryEdit_view.aod
@@ -25,6 +25,10 @@
           <name>3fb4b999-853a-407e-b928-8f5e633c1dc5</name>
           <entityField>ISACTIVE</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>fc93fdff-860e-4593-8355-9c2677877964</name>
+          <entityField>KEYID</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 37211f010c065d375041efbf7123f747fb4f9199..107d221157400fd66c0bca8377f191310dcc3e7b 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -18,6 +18,10 @@
           <name>0e85b64c-6ce8-4221-8544-b8b5152a1292</name>
           <entityField>#ICON</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>7f8c3b75-62dc-4826-bad3-99aa9d471067</name>
+          <entityField>CONTAINER</entityField>
+        </neonTableColumn>
         <neonTableColumn>
           <name>4dc50d75-d856-4fca-bd4d-d79eb3c8769f</name>
           <entityField>KEYID</entityField>
@@ -31,8 +35,8 @@
           <entityField>ISACTIVE</entityField>
         </neonTableColumn>
         <neonTableColumn>
-          <name>7f8c3b75-62dc-4826-bad3-99aa9d471067</name>
-          <entityField>CONTAINER</entityField>
+          <name>64a15e98-c6da-4c36-b20b-af1867b15602</name>
+          <entityField>SORTING</entityField>
         </neonTableColumn>
       </columns>
     </tableViewTemplate>