diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index b1ef5987822005bd2acc6bf98a1bad48521dc7e8..d2a3bbfd5dd124d0eb4c4db89e722de15235536a 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -4,6 +4,7 @@
   <title>LogHistory</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <iconId>NEON:HISTORY</iconId>
+  <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
   <recordContainer>db</recordContainer>
   <entityFields>
     <entityProvider>
@@ -68,16 +69,20 @@
       <name>LOGHISTORYID</name>
       <mandatory v="true" />
     </entityField>
+    <entityField>
+      <name>ICON</name>
+      <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
-      <title>LogHistory</title>
+      <title>db</title>
       <alias>Data_alias</alias>
       <conditionProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <linkInformation>
         <linkInformation>
-          <name>8833847a-8371-4cd4-a67e-f56daa2a11b2</name>
+          <name>6becd235-2c53-4ddb-916c-e25da8fc59f5</name>
           <tableName>AB_LOGHISTORY</tableName>
           <primaryKey>AB_LOGHISTORYID</primaryKey>
           <isUIDTable v="true" />
@@ -88,28 +93,19 @@
         <dbRecordFieldMapping>
           <name>DATE_NEW.value</name>
           <recordfield>AB_LOGHISTORY.DATE_NEW</recordfield>
-          <expression>%aditoprj%/entity/LogHistory_entity/recordcontainers/db/recordfieldmappings/date_new.value/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>DESCRIPTION.value</name>
           <recordfield>AB_LOGHISTORY.DESCRIPTION</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>TABLENAME.value</name>
-          <recordfield>AB_LOGHISTORY.TABLENAME</recordfield>
-        </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>TABLENAMEID.value</name>
-          <recordfield>AB_LOGHISTORY.TABLENAMEID</recordfield>
+          <name>LOGHISTORYID.value</name>
+          <recordfield>AB_LOGHISTORY.AB_LOGHISTORYID</recordfield>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>USER_NEW.value</name>
           <recordfield>AB_LOGHISTORY.USER_NEW</recordfield>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>LOGHISTORYID.value</name>
-          <recordfield>AB_LOGHISTORY.AB_LOGHISTORYID</recordfield>
-        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js b/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js
index 64d80196abae86ad6fdd5799efb1d46c31466ca9..14f2595687bf9e2b36d2320ba6d51f7cb095c93c 100644
--- a/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/LogHistory_entity/recordcontainers/db/conditionProcess.js
@@ -1,7 +1,9 @@
+import("system.logging");
 import("system.vars");
 import("system.result");
 
 var sql = "(TABLENAMEID = '" + vars.get("$param.tablenameId_param") + "' and TABLENAME = '" + vars.get("$param.tablename_param") + "') "
     + "or (TABLENAMEID = '" + vars.get("$param.contactId_param") + "' "
     + "and (TABLENAME='CONTACT' or TABLENAME='COMMUNICATION' or TABLENAME='ADDRESS' or TABLENAME='AB_ATTRIBUTERELATION'))";
+logging.log(sql);
 result.string(sql);
\ No newline at end of file
diff --git a/entity/LogHistory_entity/recordcontainers/db/recordfieldmappings/date_new.value/expression.js b/entity/LogHistory_entity/recordcontainers/db/recordfieldmappings/date_new.value/expression.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index b735b1f2fd76e039cbacd7a6e0c3aac886b0c261..47ee981a8d574ec0d618b02408487bfaff255ee5 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -616,6 +616,7 @@
     </entityActionField>
     <entityConsumer>
       <name>LogHistoryConsumer</name>
+      <title>LogHistory</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
diff --git a/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js b/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js
index 4e58df9abaef845e440b362f86c72e82667d3e8f..14d6871393003b0b6325435e481d28140c3fb036 100644
--- a/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("Context_lib");
 
-result.string(ContextUtils.getContextName(ContextUtils.getCurrentContextId()));
\ No newline at end of file
+result.string(ContextUtils.getContextName(ContextUtils.getCurrentContextId()).toUpperCase());
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 507970ed268901df16651094d45c060c81ddedc9..c8e62e3e26ab9896424f940db8d80b60f18bad3a 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -715,6 +715,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
     </entityField>
     <entityConsumer>
       <name>LogHistoryConsumer</name>
+      <title>LogHistory</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
diff --git a/entity/Person_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js b/entity/Person_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js
index 4e58df9abaef845e440b362f86c72e82667d3e8f..14d6871393003b0b6325435e481d28140c3fb036 100644
--- a/entity/Person_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/loghistoryconsumer/children/tablename_param/valueProcess.js
@@ -1,4 +1,4 @@
 import("system.result");
 import("Context_lib");
 
-result.string(ContextUtils.getContextName(ContextUtils.getCurrentContextId()));
\ No newline at end of file
+result.string(ContextUtils.getContextName(ContextUtils.getCurrentContextId()).toUpperCase());
\ No newline at end of file
diff --git a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
index 6f6197446ff38b861bd2c65e54d0aea8e3794b19..f38a82a471aaec588c629a6cfd04a4d18f881a7e 100644
--- a/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
+++ b/neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod
@@ -2,7 +2,7 @@
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
   <name>LogHistoryFilter_view</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="true" />
+  <filterable v="false" />
   <layout>
     <boxLayout>
       <name>layout</name>