diff --git a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
index 99936d61..6cb09105 100644
--- a/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/Controls/POListControl.xaml.cs
@@ -79,6 +79,8 @@ namespace ENI2.Controls
                     {
                         workSheet.Cells[rowIndex, 7].Value = core.Shipname;
                         workSheet.Cells[rowIndex, 10].Value = core.PoC.Substring(2);
+                        if(core.ATA.HasValue)
+                            workSheet.Cells[rowIndex, 11].Value = core.ATA.Value;
                         workSheet.Cells[rowIndex, 13].Value = core.PONumber;
                         rowIndex++;
                     }
@@ -191,8 +193,9 @@ namespace ENI2.Controls
             DateTime start = bsmd.database.Util.FirstDateOfWeekISO8601(DateTime.Now.Year, (int)this.doubleUpDownCalendarWeek.Value);
             DateTime end = start.Add(new TimeSpan(6, 23, 59, 59));
             
-            uint from = start.ToUniversalTime().ToUnixTimeStamp();
-            uint to = end.ToUniversalTime().ToUnixTimeStamp();           
+            // Die Suche findet in einem erweiterten Intervall statt, da später wenn möglich nach ATA gefiltert wird
+            uint from = start.Subtract(new TimeSpan(10, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();
+            uint to = end.Add(new TimeSpan(5, 0, 0, 0)).ToUniversalTime().ToUnixTimeStamp();           
             filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from.ToString() ?? "", to.ToString() ?? ""));
 
             Util.UIHelper.SetBusyState();
@@ -201,6 +204,23 @@ namespace ENI2.Controls
             this.searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
             // alle anderen Häfen weg
             this.searchResult.RemoveAll(item => (!item.PoC.Equals("DEBRV") && !item.PoC.Equals("DEWHV")));
+
+            // rückwärts iterieren um nach ETA und ATA zu filtern
+            if (this.searchResult.Count > 0)
+            {
+                for (int i = this.searchResult.Count - 1; i >= 0; i--)
+                {
+                    MessageCore messageCore = this.searchResult[i];
+                    if (messageCore.ATA.HasValue)
+                    {
+                        if ((messageCore.ATA.Value < start) || (messageCore.ATA.Value > end)) this.searchResult.RemoveAt(i);
+                    }
+                    else
+                    {
+                        if ((messageCore.ETA.Value < start) || (messageCore.ETA.Value > end)) this.searchResult.RemoveAt(i);
+                    }
+                }
+            }
             
             this.dataGridPOCores.SelectedItem = null;
             this.filteredResult.AddRange(searchResult);
diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index 76c88c39..6bdf35e7 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -70,8 +70,8 @@ namespace ENI2
                 foreach (Message aMessage in _messages)
                 {
                     if (((aMessage.InternalStatus == Message.BSMDStatus.UPDATED) ||
-                        (aMessage.InternalStatus == Message.BSMDStatus.SAVED) ||
-                        (aMessage.InternalStatus == Message.BSMDStatus.EXCEL)) &&                        
+                        (aMessage.InternalStatus == Message.BSMDStatus.SAVED)) && // ||
+                        // (aMessage.InternalStatus == Message.BSMDStatus.EXCEL)) &&                        
                         !aMessage.UnsentMessageWarningShown)
                     {
                         aMessage.UnsentMessageWarningShown = true;
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 4aaccf82..55a0460a 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,7 +35,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>6.0.5.%2a</ApplicationVersion>
+    <ApplicationVersion>6.0.7.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 9ff5ff96..a3bf5da8 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
index 996636fb..0f5f4ba1 100644
--- a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
+++ b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs
@@ -1106,7 +1106,7 @@ namespace bsmd.ReportGenerator
                         }
                     }
                     break;
-                case "Ship Type":                    
+                case "Ship Type":
                         if (LocalizedLookup.getVesselTypes().ContainsKey(value))
                             result = string.Format("{0} - {1}", value, LocalizedLookup.getVesselTypes()[value]);
                     break;
@@ -1135,6 +1135,16 @@ namespace bsmd.ReportGenerator
                         }
                     }
                     break;
+                case "IMOHazardClass":
+                    {
+                        switch(value)
+                        {
+                            case "0": result = "A"; break;
+                            case "1": result = "B"; break;
+                            case "2": result = "A and B"; break;
+                        }
+                    }
+                    break;
                 default:
                     break;
             }
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 7e663349..88776982 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.0.6")]
+[assembly: AssemblyInformationalVersion("6.0.7")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2020 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index 82d8572a..d7d0248b 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.0.6.*")]
+[assembly: AssemblyVersion("6.0.7.*")]