diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod
index e9c64ad8d76046a903848fbfd183d87ae793d96b..56a1cfe3d47a8024981c256e0e0b1ab1cec092f3 100644
--- a/entity/History_entity/History_entity.aod
+++ b/entity/History_entity/History_entity.aod
@@ -7,6 +7,7 @@
   <fromClauseProcess>%aditoprj%/entity/History_entity/fromClauseProcess.js</fromClauseProcess>
   <conditionProcess>%aditoprj%/entity/History_entity/conditionProcess.js</conditionProcess>
   <onDBInsert>%aditoprj%/entity/History_entity/onDBInsert.js</onDBInsert>
+  <onDBDelete>%aditoprj%/entity/History_entity/onDBDelete.js</onDBDelete>
   <recordContainerType>DB</recordContainerType>
   <caption>History</caption>
   <iconId>NEON:HISTORY</iconId>
diff --git a/entity/History_entity/onDBDelete.js b/entity/History_entity/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..2949aff8f675303a0ee647b6e044a9030c1c5e58
--- /dev/null
+++ b/entity/History_entity/onDBDelete.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+
+db.deleteData("HISTORYLINK", "HISTORYLINK.HISTORY_ID = '" + vars.getString("$field.HISTORYID") + "'");
+
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 2f422064040971961c3e7753c22129549a11eb87..2236c4ff74e833fd3ada525a9dd3ecb37d82eb10 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -44,7 +44,7 @@
       <tableName>ORG</tableName>
       <columnName>INFO</columnName>
       <caption>Information</caption>
-      <contentType>TEXT</contentType>
+      <contentType>LONG_TEXT</contentType>
     </entityField>
     <entityField>
       <name>NAME</name>
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 5c9dedcccd8ce63aedf97f2d43894e07ef5a1352..1111157e588cc5c2ddc280a306a0632c5c8a5000 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -118,7 +118,6 @@
       <valueProcess>%aditoprj%/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js</valueProcess>
       <description>FIELDGROUP</description>
       <fields>
-        <element>SALUTATION</element>
         <element>FIRSTNAME</element>
         <element>LASTNAME</element>
       </fields>
diff --git a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js b/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
index 6bbb34256dbb4cd24db4643bd33c74245b79e3d0..c2324874401ddad22716417f220710e3bcca13bd 100644
--- a/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
+++ b/entity/Pers_entity/entityfields/name_fieldgroup/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.vars");
 import("system.result");
 
-result.string(vars.get("$field.SALUTATION") + " " + vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
+result.string(vars.get("$field.FIRSTNAME") + " " + vars.get("$field.LASTNAME") );
\ No newline at end of file
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index 7a8cfffccb5d719bb8b7adb6e489a62dddd7f85f..4c941ef483f2eb03640fe41d12637724c29dc615 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -30,7 +30,6 @@
       <name>YOUTUBE</name>
       <contentType>HTML</contentType>
       <valueProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueProcess.js</valueProcess>
-      <valueMappingProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueMappingProcess.js</valueMappingProcess>
     </entityField>
     <entityParameter>
       <name>Account_param</name>
diff --git a/entity/Social_entity/entityfields/youtube/valueMappingProcess.js b/entity/Social_entity/entityfields/youtube/valueMappingProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod
index 48adc67106f61ba794f87ac64063062f3d2af560..5f77bdaab1821fb500a21fa9c0a13b65fe54691b 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/PersMain_view/PersMain_view.aod
@@ -19,10 +19,5 @@
       <entityField>PersHistory_dfo</entityField>
       <view>HistoryFilter_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>d23e96e5-24de-4aca-861e-f339b729da34</name>
-      <entityField>PersAddress_dfo</entityField>
-      <view>AddressFilter_view</view>
-    </neonViewReference>
   </children>
 </neonView>
diff --git a/neonView/PersPreview_view/PersPreview_view.aod b/neonView/PersPreview_view/PersPreview_view.aod
index 1171a3ae22d26be6d8d3cbd31938c6abd7a84761..d2e167f33ec60505bc7fbcbf361134afa87768d3 100644
--- a/neonView/PersPreview_view/PersPreview_view.aod
+++ b/neonView/PersPreview_view/PersPreview_view.aod
@@ -28,8 +28,13 @@
     <genericViewTemplate>
       <name>PersInfo_template</name>
       <showDrawer v="true" />
+      <drawerCaption>weitere Informationen</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>b1fae414-9818-48ff-8774-c310caf34d79</name>
+          <entityField>SALUTATION</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>c12f22ff-3536-45b6-b26f-1d8de6b5aea0</name>
           <entityField>TITLE</entityField>