diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 7ee20ef3..e1704e53 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -34,8 +34,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.4.0.%2a</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>6.4.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index f8988ad9..5976d1a8 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index 3359e133..51f0dc3f 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -1369,7 +1369,7 @@ namespace bsmd.database
                 cmd.Parameters.AddWithValue("@ID", core.Id);
                 int total = this.PerformReadIntQuery(cmd) ?? 0;
 
-                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND  MessageHeader.NotificationClass > 2 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
+                cmd.CommandText = "SELECT COUNT(*) FROM MessageHeader WHERE MessageHeader.MessageCoreId = @ID AND MessageHeader.BSMDStatus = 5 AND  MessageHeader.NotificationClass > 1 AND MessageHeader.NotificationClass < 28"; // compare "CONFIRMED"
                 int sent = this.PerformReadIntQuery(cmd) ?? 0;
 
                 core.NumberSent = string.Format("{0}/{1}", sent, total);
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index ef4f9508..dbddb53b 100644
--- a/nsw/Source/bsmd.hisnord/Request.cs
+++ b/nsw/Source/bsmd.hisnord/Request.cs
@@ -1238,19 +1238,19 @@ namespace bsmd.hisnord
 
 
                                             hn_waste.WasteDetails = new wastedetails();
-                                            hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified = waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
-                                            if (hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified)
-                                                hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = (float)waste.WasteAmountGeneratedTillNextPort_MTQ.Value;
+                                            hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified = true; // waste.WasteAmountGeneratedTillNextPort_MTQ.HasValue;
+                                            // if (hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQSpecified)
+                                            hn_waste.WasteDetails.WasteAmountGeneratedTillNextPort_MTQ = (float) (waste.WasteAmountGeneratedTillNextPort_MTQ ?? 0);
 
-                                            hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified = waste.WasteAmountRetained_MTQ.HasValue;
-                                            if (hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified)
-                                                hn_waste.WasteDetails.WasteAmountRetained_MTQ = (float)waste.WasteAmountRetained_MTQ.Value;
+                                            hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified = true; // waste.WasteAmountRetained_MTQ.HasValue;
+                                            // if (hn_waste.WasteDetails.WasteAmountRetained_MTQSpecified)
+                                            hn_waste.WasteDetails.WasteAmountRetained_MTQ = (float) (waste.WasteAmountRetained_MTQ ?? 0);
 
-                                            hn_waste.WasteDetails.WasteCapacity_MTQSpecified = waste.WasteCapacity_MTQ.HasValue;
-                                            if (hn_waste.WasteDetails.WasteCapacity_MTQSpecified)
-                                                hn_waste.WasteDetails.WasteCapacity_MTQ = (float)waste.WasteCapacity_MTQ.Value;
+                                            hn_waste.WasteDetails.WasteCapacity_MTQSpecified = true; // waste.WasteCapacity_MTQ.HasValue;
+                                            // if (hn_waste.WasteDetails.WasteCapacity_MTQSpecified)
+                                            hn_waste.WasteDetails.WasteCapacity_MTQ = (float) (waste.WasteCapacity_MTQ ?? 0);
 
-                                            hn_waste.WasteDetails.WasteDisposalPort = waste.WasteDisposalPort;
+                                            hn_waste.WasteDetails.WasteDisposalPort = waste.WasteDisposalPort.IsNullOrEmpty() ? "ZZUKN" : waste.WasteDisposalPort;
 
                                             was_items.Add(hn_waste);
                                             was_item_names.Add(ItemsChoiceType6.Waste);