diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 1d02fe458c4f96e83cf8c7d8058abcd914502dee..9cd0ce359ce3b9e03ad3baa08dd7665f094f34cc 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -52,12 +52,6 @@
       <title>Salutation</title>
       <consumer>Salutations</consumer>
       <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
-      <onValueChange>%aditoprj%/entity/Person_entity/entityfields/salutation/onValueChange.js</onValueChange>
-      <onValueChangeTypes>
-        <element>MASK</element>
-        <element>PROCESS</element>
-        <element>RECORD</element>
-      </onValueChangeTypes>
     </entityField>
     <entityField>
       <name>TITLE</name>
@@ -199,10 +193,6 @@
           <description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry. 
 Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
         </entityParameter>
-        <entityParameter>
-          <name>CommCategory_param</name>
-          <description>TODO: expose auf false. aktuell wird der Code nicht ausgef�hrt, wenn Expose false ist.</description>
-        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>
@@ -314,8 +304,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
       <onValueChangeTypes>
         <element>MASK</element>
-        <element>PROCESS</element>
-        <element>RECORD</element>
       </onValueChangeTypes>
     </entityField>
     <entityConsumer>
@@ -779,6 +767,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           <name>LANGUAGE.displayValue</name>
           <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>SALUTATION.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>TITLE.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Person_entity/entityfields/language/onValueChange.js b/entity/Person_entity/entityfields/language/onValueChange.js
index 531e01b7ec459ca2465f88d9c57f4dc19f4da7e1..bff15d2335ac3186ec917f10525983f29e555b86 100644
--- a/entity/Person_entity/entityfields/language/onValueChange.js
+++ b/entity/Person_entity/entityfields/language/onValueChange.js
@@ -7,5 +7,5 @@ if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.re
     neon.setFieldValue("$field.SALUTATION", "");
     neon.setFieldValue("$field.TITLE", "");
     
-    neon.refresh(["$field.SALUTATION", "$field.TITLE"]);
+    //neon.refresh(["$field.SALUTATION", "$field.TITLE"]);
 }
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/displayValueProcess.js b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
index e7bc31ecaedcd80e517b146a0ceb1b42ec52b8e8..47a0854d82508186c442dd64103e33b462f48db3 100644
--- a/entity/Person_entity/entityfields/salutation/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
@@ -1,7 +1,9 @@
-//import("system.vars");
-//import("system.db");
-//import("system.result");
-//import("Sql_lib");
-//
-//var cond = SqlCondition.begin()
-//result.string(db.cell(cond.andPrepareVars("PERSON.PERSONID", "$field.PERSONID").buildSql("select SALUTATION from PERSON", "1=2")));
\ No newline at end of file
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+{
+    if (!vars.get("$field.SALUTATION"))
+        result.string("")
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/onValueChange.js b/entity/Person_entity/entityfields/salutation/onValueChange.js
deleted file mode 100644
index 161d7c37cf54b5dadec0a51b518a586cf6f09f9a..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/salutation/onValueChange.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.vars");
-import("system.neon");
-
-if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
-{
-    neon.setFieldValue("$field.TITLE", "");
-    
-    neon.refresh(["$field.TITLE"]);
-}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/title/displayValueProcess.js b/entity/Person_entity/entityfields/title/displayValueProcess.js
index 67f0faec9f057de097dbc4c16170633460eaa5c8..3682b56b29c28eb54083e5d08025f851591aed2c 100644
--- a/entity/Person_entity/entityfields/title/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/title/displayValueProcess.js
@@ -1,7 +1,9 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = SqlCondition.begin()
-result.string(db.cell(cond.andPrepareVars("PERSON.PERSONID", "$field.PERSONID").buildSql("select TITLE from PERSON", "1=2")));
\ No newline at end of file
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+{
+    if (!vars.get("$field.TITLE"))
+        result.string("")
+}
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4d0a4e0b677f6ba8fb58e68c3a15381b26942bb
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALUTATION");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b02537f776e09bb62333e1b0921b9fe913f1599d
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("TITLE");
\ No newline at end of file
diff --git a/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js b/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
index 4e281d752240066d1a435a7dd5b5bf8defb52bbb..0e53e6c736a0703710a88cb472eb79eff71ccd7e 100644
--- a/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
@@ -6,4 +6,4 @@ import("Sql_lib");
 result.object(db.table(SqlCondition.begin()
                         .and("SALUTATION is not NULL")
                         .andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
-                        .buildSql("select distinct SALUTATION from SALUTATION", "1=2")));
\ No newline at end of file
+                        .buildSql("select distinct SALUTATION from SALUTATION", "1=1")));
\ No newline at end of file
diff --git a/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js b/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
index f584ebd50ba837628a7e955bd9d1c7bc2ff4d54f..8c0df5ff1d2cfee0ffc9a5ff526ebf4a608a072f 100644
--- a/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
@@ -7,4 +7,4 @@ result.object(db.table(SqlCondition.begin()
                     .and("TITLE is not NULL")
                     .andPrepareVars("SALUTATION.SALUTATION", "$param.Salutation_param")
                     .andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
-                    .buildSql("select distinct TITLE from SALUTATION", "1=2")));
\ No newline at end of file
+                    .buildSql("select distinct TITLE from SALUTATION", "1=1")));
\ No newline at end of file
diff --git a/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod b/neonView/ObjectRelationTree_view/ObjectRelationTree_view.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/report/RPTJ_OFFER/RPTJ_OFFER.aod b/report/RPTJ_OFFER/RPTJ_OFFER.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod b/report/RPTJ_ORGANISATION/RPTJ_ORGANISATION.aod
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000