diff --git a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
index eaa6a8a8..0e73f223 100644
--- a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
@@ -130,6 +130,7 @@ namespace ENI2.Controls
                     {
                         editedCore.SetFlag(true, coreFlag);
                     }
+                    buttonSaveChanges.IsEnabled = true;
                     editedCore.IsDirty = true;
                 }
             }
@@ -141,6 +142,7 @@ namespace ENI2.Controls
 
         private void PerformSearch()
         {
+            this.dataGridPOCores.ItemsSource = null;
             this.filteredResult.Clear();
 
             if (!this.doubleUpDownCalendarWeek.Value.HasValue) return;
@@ -163,7 +165,7 @@ namespace ENI2.Controls
             
             this.dataGridPOCores.SelectedItem = null;
             this.filteredResult.AddRange(searchResult);
-
+            this.dataGridPOCores.ItemsSource = this.filteredResult;
         }
 
 
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
index eaf800a2..0f420a23 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml.cs
@@ -3,9 +3,12 @@
 // Description: Detailansicht Gruppe Port Notification
 //
 
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
+
 using ENI2.EditControls;
 using ENI2.Util;
 
@@ -366,11 +369,13 @@ namespace ENI2.DetailViewControls
             this.Core.SetFlag(false, MessageCore.CoreFlags.MAERSK_BHV);
             this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_BHV);
             this.Core.SetFlag(false, MessageCore.CoreFlags.SEAGO_WHV);
-            if((int) this.comboBoxGroup.SelectedValue != 0)
+
+            DictionaryEntry selectedItem = (DictionaryEntry) this.comboBoxGroup.SelectedItem;
+            if(Int32.TryParse((string)selectedItem.Value, out int selectedValue))
             {
-                this.Core.SetFlag(true, (MessageCore.CoreFlags)this.comboBoxGroup.SelectedValue);
-            }
-            DBManager.Instance.Save(this.Core);
+                this.Core.SetFlag(true, (MessageCore.CoreFlags)selectedValue);
+                DBManager.Instance.Save(this.Core);
+            }                                                    
         }
 
         #endregion
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 88e0f42c..2dce5ec5 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ