diff --git a/entity/Appointment_entity/contentProcess.js b/entity/Appointment_entity/contentProcess.js
index 7b83997ecfd16b3c8cfa8a57cd149c4a9f24b40a..20584de9f7b1bf36da3fd77f6c071f0c500f154a 100644
--- a/entity/Appointment_entity/contentProcess.js
+++ b/entity/Appointment_entity/contentProcess.js
@@ -27,7 +27,7 @@ if(vars.exists("$param.entry"))
     var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
     var status = entry[calendars.STATUS];
     var location = entry[calendars.LOCATION];
-    var reminder = entry[calendars.REMINDER];
+    var reminder = entry[calendars.REMINDER_DURATION];
     var remindercheck = entry[calendars.HASREMINDER]
     var classification = entry[calendars.CLASSIFICATION];
     var transparency = entry[calendars.TRANSPARENCY];
diff --git a/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js b/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js
index 74fdc79b4a4ad83059a393470a41a5487d6b77c9..cb33320206448252facfd658ebb4bf79cc8ad9b6 100644
--- a/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js
+++ b/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js
@@ -4,21 +4,19 @@ import("system.translate");
 import("system.calendars");
 
 if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS )
-{    
-    logging.log("possible items: if")
-    
-    result.object( [ [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")]
-          , [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")]
-          , [calendars.STATUS_CANCELLED, translate.text("Abgesagt")]
-          ] );
+{
+    result.object([ 
+            [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")],
+            [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")],
+            [calendars.STATUS_CANCELLED, translate.text("Abgesagt")]
+          ]);
 }
 else 
-{    
-    logging.log("possible items: else")
-    
-    result.object( [ [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")]
-          , [calendars.STATUS_BUSY, translate.text("Gebucht")]
-          , [calendars.STATUS_OOF, translate.text("Außer Haus")]
-          , [calendars.STATUS_FREE, translate.text("frei")] 
+{
+    result.object( [ 
+            [calendars.STATUS_BUSY, translate.text("Gebucht")],
+            [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")],
+            [calendars.STATUS_OOF, translate.text("Außer Haus")],
+            [calendars.STATUS_FREE, translate.text("frei")] 
           ] );
 }
\ No newline at end of file
diff --git a/entity/Appointment_entity/onInsert.js b/entity/Appointment_entity/onInsert.js
index d9648f110d4b5e36624417367b76258f8143b80f..d77a6e5416601241001710359aa856d02ce5302a 100644
--- a/entity/Appointment_entity/onInsert.js
+++ b/entity/Appointment_entity/onInsert.js
@@ -22,39 +22,14 @@ event[calendars.LOCATION] = vars.get("$field.LOCATION");
 event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
 event[calendars.DTSTART] = vars.get("$field.STARTDATE");
 event[calendars.DTEND] = vars.get("$field.ENDDATE");
-event[calendars.HASREMINDER] = "false";
-var hasReminder = vars.get("$field.REMINDER_CHECK");
-if (hasReminder == "true")
-{
-    // Absolut nur, wenn auch gesetzt. Default ist relativ
-    if ( event[calendars.REMINDER_ABSOLUT] == "true")
-    {
-        var reminder_date = vars.get("$field.REMINDER");
-        if ( reminder_date != "" )
-        {
-            event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER_DATE] = reminder_date;
-        }
-    }
-    else
-    {
-        var reminder_duration = vars.getString("$field.reminder_duration");
-        if ( reminder_duration != "")
-        {
-            event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER_DURATION] = reminder_duration;
-        }
-    }
-    
-}
 event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
 event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY"); 
 event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-//calcrecurrence(event);
-//if (event[calendars.RRULE] != undefined)     recurrencend(event);
-// Links updaten
-//    swing.saveTableEdit("$field.links");
-// Entweder jetzt neu anlegen oder nur updaten
+if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
+{
+    event[calendars.HASREMINDER] = "true";
+    event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
+}
 event[calendars.ID] = calendars.insert([event])[0];
 vars.set("$image.editmode", calendars.MODE_UPDATE);
 ok = true;
diff --git a/entity/Appointment_entity/onUpdate.js b/entity/Appointment_entity/onUpdate.js
index e455951350c37258d85a4cccdd86818b07faefff..8761d4bf40789fce2293b40149d4b39916b4d2ca 100644
--- a/entity/Appointment_entity/onUpdate.js
+++ b/entity/Appointment_entity/onUpdate.js
@@ -41,7 +41,7 @@ if(vars.exists("$param.entry"))
         if (vars.get("$field.REMINDER") != undefined && vars.get("$field.REMINDER") != "")
         {
             event[calendars.HASREMINDER] = "true";
-            event[calendars.REMINDER] = vars.get("$field.REMINDER");
+            event[calendars.REMINDER_DURATION] = vars.get("$field.REMINDER");
         }
             //event[calendars.AFFECTEDUSERS] = getAffectedUsers( event ); 
         //    calcrecurrence(event);
diff --git a/entity/History_entity/History_entity.aod b/entity/History_entity/History_entity.aod
index fe9f04dc945a48ba9a0fd0a7aa9df43fb2d57a25..28ac88a64b1f8da37ccf53a89dee1f8205b61126 100644
--- a/entity/History_entity/History_entity.aod
+++ b/entity/History_entity/History_entity.aod
@@ -3,15 +3,15 @@
   <name>History_entity</name>
   <title>History</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
+  <recordContainerType>DB</recordContainerType>
+  <caption>History</caption>
+  <iconId>NEON:HISTORY</iconId>
+  <imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess>
   <alias>Data_alias</alias>
   <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>
-  <imageProcess>%aditoprj%/entity/History_entity/imageProcess.js</imageProcess>
   <entityFields>
     <entityField>
       <name>DIRECTION</name>
@@ -129,6 +129,11 @@
     <entityIncomingField>
       <name>#INCOMING</name>
     </entityIncomingField>
+    <entityField>
+      <name>ICON</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/History_entity/entityfields/icon/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <linkInformation>
     <linkInformation>
diff --git a/entity/History_entity/entityfields/icon/valueProcess.js b/entity/History_entity/entityfields/icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d1c6b169de486104235d26a7ca3f1155bd5fad5
--- /dev/null
+++ b/entity/History_entity/entityfields/icon/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+result.string("NEON:HISTORY");
\ No newline at end of file
diff --git a/neonView/HistoryFilter_view/HistoryFilter_view.aod b/neonView/HistoryFilter_view/HistoryFilter_view.aod
index fe3eedea99e12e176ea669af357bf6742f59cdf1..03685f5f1a3bc30c3cb06b639978ecdfea3768f7 100644
--- a/neonView/HistoryFilter_view/HistoryFilter_view.aod
+++ b/neonView/HistoryFilter_view/HistoryFilter_view.aod
@@ -46,5 +46,11 @@
       <iconIdField>DIRECTION_ICON</iconIdField>
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
+    <treetableViewTemplate>
+      <name>Treetable</name>
+      <descriptionField>SUBJECT</descriptionField>
+      <iconField>ICON</iconField>
+      <entityField>#ENTITY</entityField>
+    </treetableViewTemplate>
   </children>
 </neonView>