diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 33a2f4dc7d5b3ad349cc08bdbcd825c91a150092..e04596e9cf5502542592216b3d7b0e0c727175ab 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -49,6 +49,7 @@
       <name>SALUTATION</name>
       <title>Salutation</title>
       <consumer>Salutations</consumer>
+      <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess>
       <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
diff --git a/entity/Person_entity/entityfields/language/valueProcess.js b/entity/Person_entity/entityfields/language/valueProcess.js
index ebaf1bb63bcccaaac9729d5fe437bdb43d360b97..4a47bbccc1344c5124bee1b3402f6deabb162c73 100644
--- a/entity/Person_entity/entityfields/language/valueProcess.js
+++ b/entity/Person_entity/entityfields/language/valueProcess.js
@@ -5,6 +5,5 @@ import("system.db");
 import("system.result");
 
 
-logging.log("kljkk " + vars.get("$field.SALUTATION"))
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
     result.string("deu");
\ 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 927bb4fb7ea161586866850e85e971e74c11b746..23500893ccea7156b46f5f0c46d85341ff55189d 100644
--- a/entity/Person_entity/entityfields/salutation/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
@@ -1,5 +1,7 @@
 import("system.vars");
 import("system.db");
 import("system.result");
+import("Sql_lib");
 
-result.string(db.cell("select SALUTATION from PERSON where PERSONID = '" + vars.get("$field.PERSONID") + "'"));
\ No newline at end of file
+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
diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js b/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js
index cada0795b3ef47e81ab39d537c57c8a8bdbdbe5a..72099ab8ff368614c9a41786c0b1d8cc46dfb010 100644
--- a/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js
+++ b/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/code.js
@@ -2,7 +2,4 @@ import("system.vars");
 import("system.result");
 import("system.logging")
 
-logging.log("dsfksdjnfksj" + vars.get("$field.ORGANISATION_ID"));
-logging.log("ff" + vars.get("$field.SALUTATION"));
-
 result.string(vars.get("$field.SALUTATION"));
\ 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 7a4911a0e3d7f70a8406c0d6e1cf1473b9de1705..67f0faec9f057de097dbc4c16170633460eaa5c8 100644
--- a/entity/Person_entity/entityfields/title/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/title/displayValueProcess.js
@@ -1,5 +1,7 @@
 import("system.vars");
 import("system.db");
 import("system.result");
+import("Sql_lib");
 
-result.string(db.cell("select TITLE from PERSON where PERSONID = '" + vars.get("$field.PERSONID") + "'"));
\ No newline at end of file
+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
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 1acb5474ce888a162e419c1937d3b0bf35c3f0df..0e959b81d277a6282920d440249ec03b3f58d25b 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -115,7 +115,6 @@
     <entityField>
       <name>UID</name>
       <titleProcess>%aditoprj%/entity/Salutation_entity/entityfields/uid/titleProcess.js</titleProcess>
-      <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/uid/valueProcess.js</valueProcess>
     </entityField>
     <entityParameter>
       <name>uIdDefinition_param</name>
diff --git a/entity/Salutation_entity/entityfields/uid/titleProcess.js b/entity/Salutation_entity/entityfields/uid/titleProcess.js
index 8e908a6ca5a1a57c9ab0e480f98e5b5fe5edba5b..764d0886fa0a81fa3ca49a732069e40896152f9f 100644
--- a/entity/Salutation_entity/entityfields/uid/titleProcess.js
+++ b/entity/Salutation_entity/entityfields/uid/titleProcess.js
@@ -3,9 +3,8 @@ import("system.result");
 
 var uIdDefinition = vars.get("$param.uIdDefinition_param")
 
-
-if(uIdDefinition == "SALUTATION")
+if (uIdDefinition == "SALUTATION")
     result.string("Anrede")
 
-if(uIdDefinition == "TITLE")
+if (uIdDefinition == "TITLE")
     result.string("Titel")
\ No newline at end of file
diff --git a/entity/Salutation_entity/entityfields/uid/valueProcess.js b/entity/Salutation_entity/entityfields/uid/valueProcess.js
deleted file mode 100644
index ef19222863e28ddae9bddbe8f66ebebb2be87a45..0000000000000000000000000000000000000000
--- a/entity/Salutation_entity/entityfields/uid/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//import("system.logging");
-//import("system.vars");
-//import("system.result");
-//
-//var uIdDefinition = vars.get("$param.uIdDefinition_param")
-//
-//
-//if(uIdDefinition == "SALUTATION")
-//    result.string(vars.get("$field.SALUTATION"))
-//
-//if(uIdDefinition == "TITLE")
-//    result.string(vars.get("$field.TITLE"))
diff --git a/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js b/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js
index e22730569cac6fc4d8637c49407c1c9ff759f265..3557692391fc1baa92d344c856a3a3ea141ae59e 100644
--- a/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js
+++ b/entity/Salutation_entity/recordcontainers/distinctsalutation_jdito/contentProcess.js
@@ -9,6 +9,6 @@ var cond = SqlCondition.begin()
     .andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
     .buildSql("select distinct SALUTATION, SALUTATION from SALUTATION", "1=2");
     
-var salutation = db.table(cond);
+var salutations = db.table(cond);
 
-result.object(salutation);
\ No newline at end of file
+result.object(salutations);
\ No newline at end of file
diff --git a/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js b/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js
index f083f9a4454248daef2ceb4a6d0bb9de986b8e77..c4fc01944cbe7c7ac01307878b2c42a4d63db61a 100644
--- a/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js
+++ b/entity/Salutation_entity/recordcontainers/title_jdito/contentProcess.js
@@ -10,6 +10,6 @@ var cond = SqlCondition.begin()
     .andPrepareVars("SALUTATION.SALUTATION", "$param.Salutation_param")
     .buildSql("select TITLE, TITLE from SALUTATION", "1=2");
     
-var salutation = db.table(cond);
+var titles = db.table(cond);
 
-result.object(salutation);
\ No newline at end of file
+result.object(titles);
\ No newline at end of file
diff --git a/entity/Salutation_entity/titleProcess.js b/entity/Salutation_entity/titleProcess.js
index a35437175f865c00ba31b9e69a31e23727529d19..bd122fedadf7c6c13bdf9f810d85e6f2a7a4e34d 100644
--- a/entity/Salutation_entity/titleProcess.js
+++ b/entity/Salutation_entity/titleProcess.js
@@ -2,5 +2,10 @@ import("system.result");
 import("system.vars");
 
 if (vars.get("$param.uIdDefinition_param") && vars.exists("$param.uIdDefinition_param"))
+{
     result.string(vars.get("$field.UID"))
-else result.string("Anrede")
\ No newline at end of file
+}
+else 
+{
+    result.string("Anrede")
+}
\ No newline at end of file