diff --git a/ENI2/App.config b/ENI2/App.config
index 45b58b7c..9fce7c6f 100644
--- a/ENI2/App.config
+++ b/ENI2/App.config
@@ -29,7 +29,7 @@
 				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
+                <value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
@@ -52,21 +52,25 @@
     </system.serviceModel>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.2" newVersion="9.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/ENI2/CustomCommands.cs b/ENI2/CustomCommands.cs
index c52eac19..41d0bc04 100644
--- a/ENI2/CustomCommands.cs
+++ b/ENI2/CustomCommands.cs
@@ -34,8 +34,7 @@ namespace ENI2
             if (parentObject == null) return null;
 
             //check if the parent matches the type we're looking for
-            T parent = parentObject as T;
-            if (parent != null)
+            if (parentObject is T parent)
                 return parent;
             else
                 return FindParent<T>(parentObject);
diff --git a/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml b/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
index fdb65659..defe9f40 100644
--- a/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
+++ b/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml
@@ -75,7 +75,7 @@
                                 <DataGridTextColumn.Binding>
                                     <Binding Path="BunkerFuelType" Mode="TwoWay">
                                         <Binding.ValidationRules>
-                                            <util:StringValidationRule MaxLength="100" />
+                                            <util:StringValidationRule MaxLength="25" />
                                         </Binding.ValidationRules>
                                     </Binding>
                                 </DataGridTextColumn.Binding>
diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
index 75f43a9e..a65f09af 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
@@ -1162,7 +1162,7 @@ namespace ENI2.DetailViewControls
                                 if (crew.CrewMemberLastName.Equals("Family Name") || (crew.CrewMemberLastName.Trim().Length == 0)) continue;
                                 if (!reader.IsDBNull(1)) crew.CrewMemberFirstName = reader.GetString(1);
                                 if (!reader.IsDBNull(2)) crew.CrewMemberGender = GlobalStructures.ParseGender(reader.GetString(2));
-                                if (!reader.IsDBNull(3)) crew.CrewMemberDuty = reader.GetString(3);
+                                if (!reader.IsDBNull(3)) crew.CrewMemberDuty = reader.GetString(3).Clean();
                                 if (!reader.IsDBNull(4)) crew.CrewMemberNationality = reader.GetString(4).Substring(0, 2).ToUpper();
                                 if (!reader.IsDBNull(5)) crew.CrewMemberPlaceOfBirth = reader.GetString(5);
                                 if (!reader.IsDBNull(6)) crew.CrewMemberCountryOfBirth = reader.GetString(6).Substring(0, 2).ToUpper();
diff --git a/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml b/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
index aff5d676..c32ba2c9 100644
--- a/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
+++ b/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml
@@ -74,7 +74,7 @@
                                 <DataGridTextColumn.Binding>
                                     <Binding Path="BunkerFuelType" Mode="TwoWay">
                                         <Binding.ValidationRules>
-                                            <util:StringValidationRule MaxLength="100" />
+                                            <util:StringValidationRule MaxLength="25" />
                                         </Binding.ValidationRules>
                                     </Binding>
                                 </DataGridTextColumn.Binding>
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 44086faf..417d527a 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -18,7 +18,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
-    <PublishUrl>eni2.publish\</PublishUrl>
+    <PublishUrl>ENI2.publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
-    <ApplicationVersion>7.2.5.3</ApplicationVersion>
+    <ApplicationRevision>4</ApplicationRevision>
+    <ApplicationVersion>7.2.6.4</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -85,14 +85,13 @@
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
-    <ManifestCertificateThumbprint>FE53D3ADE2DCE4BD171A899FF41D43E63FEA7639</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>C5FD306818D481FBECE3B2E74D7A912F515191E0</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>
-    </ManifestKeyFile>
+    <ManifestKeyFile>ENI2_7_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 64|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -138,29 +137,29 @@
     <Reference Include="ExcelDataReader, Version=3.7.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
       <HintPath>packages\ExcelDataReader.3.7.0\lib\net462\ExcelDataReader.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Bcl.AsyncInterfaces.9.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.DependencyInjection.9.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.8.0.1\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.9.0.2\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Logging.Abstractions.9.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Options.9.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=9.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Extensions.Primitives.9.0.2\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
@@ -194,36 +193,36 @@
       <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.WPFonts.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.117.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Diagnostics.DiagnosticSource.9.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.ValueTuple.dll</HintPath>
@@ -242,20 +241,20 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=4.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=4.7.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -852,6 +851,7 @@
     <None Include="ENI2_4_TemporaryKey.pfx" />
     <None Include="ENI2_5_TemporaryKey.pfx" />
     <None Include="ENI2_6_TemporaryKey.pfx" />
+    <None Include="ENI2_7_TemporaryKey.pfx" />
     <None Include="Service References\LockingServiceReference\ENI2.LockingServiceReference.CoreLock.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
@@ -934,6 +934,7 @@
     <Resource Include="Resources\document_plain_new.png" />
     <Resource Include="Resources\exit.png" />
     <Resource Include="Resources\document_exchange.png" />
+    <Resource Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -1083,14 +1084,14 @@
     <SignToolPath Condition="'$(SignToolPath)' == '' And '$(SignToolPathBase)' != ''">$(SignToolPathBase)$(Platform)\</SignToolPath>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\ENI2_6_TemporaryKey.pfx /p FgrMFUWsTVGQeb6L6i0e /fd SHA256 $(TargetPath)</PostBuildEvent>
+    <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\ENI2_7_TemporaryKey.pfx /p FgrMFUWsTVGQeb6L6i0e /fd SHA256 $(TargetPath)</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ENI2/ENI2_7_TemporaryKey.pfx b/ENI2/ENI2_7_TemporaryKey.pfx
new file mode 100644
index 00000000..6d8bcd57
Binary files /dev/null and b/ENI2/ENI2_7_TemporaryKey.pfx differ
diff --git a/ENI2/EditControls/EditBKRDialog.xaml b/ENI2/EditControls/EditBKRDialog.xaml
index 5fc4bddc..ed65bcf4 100644
--- a/ENI2/EditControls/EditBKRDialog.xaml
+++ b/ENI2/EditControls/EditBKRDialog.xaml
@@ -19,7 +19,7 @@
             <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
         <Label Content="{x:Static p:Resources.textBunkerType}" Grid.Row="0" Grid.Column="0" />
-        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
+        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxBunkerType" Margin="2" MaxLength="25" VerticalContentAlignment="Center"/>
         <Label Content="{x:Static p:Resources.textBunkerQuantity}" Grid.Row="1" Grid.Column="0" />
         <xctk:DoubleUpDown Grid.Row="1" Grid.Column="1" Name="doubleUpDownBunkerQuantity" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N1" TextAlignment="Left" />
     </Grid>
diff --git a/ENI2/EditControls/EditCREWDialog.xaml.cs b/ENI2/EditControls/EditCREWDialog.xaml.cs
index f182f0b0..a63ad71a 100644
--- a/ENI2/EditControls/EditCREWDialog.xaml.cs
+++ b/ENI2/EditControls/EditCREWDialog.xaml.cs
@@ -79,6 +79,7 @@ namespace ENI2.EditControls
         {
             // copy back
             this.CREW.CrewMemberDuty = this.textBoxDuty.Text.Trim();
+            if (this.CREW.CrewMemberDuty.IsNullOrEmpty()) this.CREW.CrewMemberDuty = "unknown";
             this.CREW.CrewMemberLastName = this.textBoxLastName.Text.Trim();
             this.CREW.CrewMemberFirstName = this.textBoxFirstName.Text.Trim();
             this.CREW.CrewMemberGender = (this.comboBoxGender.SelectedIndex == -1) ? null : (byte?) byte.Parse((string) this.comboBoxGender.SelectedValue);
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index d447836c..fcf3b470 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -740,7 +740,7 @@ namespace ENI2.Excel
                 pas.PassengerLastName = lastName;
                 pas.PassengerFirstName = reader.ReadCellAsText("passenger departure", string.Format("C{0}", i + 16));
                 pas.PassengerPlaceOfBirth = reader.ReadCellAsText("passenger departure", string.Format("D{0}", i + 16));
-                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger departure", string.Format("E{0}", i + 16)), out bool canceled);
+                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger departure", string.Format("E{0}", i + 16)), out bool canceled, false);
                 if (canceled) return false;
                 pas.PassengerDateOfBirth = reader.ReadCellAsDateTime("passenger departure", string.Format("F{0}", i + 16));
                 pas.PassengerGender = ParseGender(reader.ReadCellAsText("passenger departure", string.Format("G{0}", i + 16)));
@@ -802,7 +802,7 @@ namespace ENI2.Excel
                 pas.PassengerLastName = lastName;
                 pas.PassengerFirstName = reader.ReadCellAsText("passenger arrival", string.Format("C{0}", i + 16));
                 pas.PassengerPlaceOfBirth = reader.ReadCellAsText("passenger arrival", string.Format("D{0}", i + 16));
-                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("E{0}", i + 16)), out bool canceled);
+                pas.PassengerCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("passenger arrival", string.Format("E{0}", i + 16)), out bool canceled, false);
                 if (canceled) return false;
                 pas.PassengerDateOfBirth = reader.ReadCellAsDateTime("passenger arrival", string.Format("F{0}", i + 16));
                 pas.PassengerGender = ParseGender(reader.ReadCellAsText("passenger arrival", string.Format("G{0}", i + 16)));
@@ -1207,7 +1207,7 @@ namespace ENI2.Excel
                 crew.CrewMemberLastName = lastName;
                 crew.CrewMemberFirstName = reader.ReadCellAsText("crew departure", string.Format("C{0}", i + 15));
                 crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText("crew departure", string.Format("D{0}", i + 15));
-                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("E{0}", i + 15)), out bool canceled);
+                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("E{0}", i + 15)), out bool canceled, false);
                 if (canceled) return false;
                 crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew departure", string.Format("F{0}", i + 15));
                 string gender = reader.ReadCellAsText("crew departure", string.Format("G{0}", i + 15));
@@ -1224,6 +1224,7 @@ namespace ENI2.Excel
                 crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew departure", string.Format("N{0}", i + 15));                
 
                 crew.CrewMemberDuty = reader.ReadCellAsText("crew departure", string.Format("L{0}", i + 15));
+                if (crew.CrewMemberDuty.IsNullOrEmpty()) crew.CrewMemberDuty = "unknown";
 
                 result = true;
             }
@@ -1256,7 +1257,7 @@ namespace ENI2.Excel
                 crew.CrewMemberLastName = lastName;
                 crew.CrewMemberFirstName = reader.ReadCellAsText("crew arrival", string.Format("C{0}", i + 15));
                 crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText("crew arrival", string.Format("D{0}", i + 15));
-                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("E{0}", i + 15)), out bool canceled);
+                crew.CrewMemberCountryOfBirth = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("E{0}", i + 15)), out bool canceled, false);
                 if (canceled) return false;
                 crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew arrival", string.Format("F{0}", i + 15));
                 string gender = reader.ReadCellAsText("crew arrival", string.Format("G{0}", i + 15));
@@ -1273,6 +1274,7 @@ namespace ENI2.Excel
                 crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew arrival", string.Format("N{0}", i + 15));                
 
                 crew.CrewMemberDuty = reader.ReadCellAsText("crew arrival", string.Format("L{0}", i + 15));
+                if (crew.CrewMemberDuty.IsNullOrEmpty()) crew.CrewMemberDuty = "unknown";
 
                 result = true;
             }
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 2b47b27c..c31e6e6b 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -2129,10 +2129,11 @@ namespace ENI2.Excel
                     if (canceled) return true;
 
                     crew.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 18), 100);
+                    if (crew.CrewMemberDuty.IsNullOrEmpty()) crew.CrewMemberDuty = "unknown";
                     crew.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18)), out canceled);
                     if (canceled) return true;
                     crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18), 100);
-                    crew.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _);                    
+                    crew.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _, false);                    
 
                     crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18));
 
@@ -2183,6 +2184,7 @@ namespace ENI2.Excel
                         if (canceled) return true;
 
                         crew.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 13));
+                        if (crew.CrewMemberDuty.IsNullOrEmpty()) crew.CrewMemberDuty = "unknown";
                         crew.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 13)), out canceled);
                         if (canceled) return true;
                         crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 13));
@@ -2246,10 +2248,11 @@ namespace ENI2.Excel
                     if (canceled) return true;
 
                     crewd.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 18), 100);
+                    if (crewd.CrewMemberDuty.IsNullOrEmpty()) crewd.CrewMemberDuty = "unknown";
                     crewd.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18)), out canceled);
                     if (canceled) return true;
                     crewd.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18), 100);
-                    crewd.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _);                    
+                    crewd.CrewMemberCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("I{0}", i + 18)), out _, false);                    
                     crewd.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18));
 
                     crewd.CrewMemberIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out canceled);
@@ -2297,6 +2300,7 @@ namespace ENI2.Excel
                         if (canceled) return true;
 
                         crewd.CrewMemberDuty = reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 14));
+                        if (crewd.CrewMemberDuty.IsNullOrEmpty()) crewd.CrewMemberDuty = "unknown";
                         crewd.CrewMemberNationality = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("F{0}", i + 14)), out canceled);
                         if (canceled) return true;
                         crewd.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 14));
@@ -2370,7 +2374,7 @@ namespace ENI2.Excel
                     pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 17));
 
                     pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 17), 100);
-                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17)), out _);                    
+                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17)), out _, false);                    
 
                     if (canceled) return true;
                     DateTime? dateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("L{0}", i + 17));
@@ -2511,7 +2515,7 @@ namespace ENI2.Excel
                     pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 18));
 
                     pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 18), 100);
-                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out _);
+                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out _, false);
 
                     if (canceled) return true;
                     DateTime? dateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("L{0}", i + 18));
@@ -2844,12 +2848,12 @@ namespace ENI2.Excel
             return result;
         }
 
-        public static string ReadNationality(string nationality, out bool canceled)
+        public static string ReadNationality(string nationality, out bool canceled, bool setPlaceHolder = true)
         {
             string result = null;
             canceled = false;
             nationality = nationality.Trim();
-            if (nationality.IsNullOrEmpty())
+            if (nationality.IsNullOrEmpty() && setPlaceHolder)
             {
                 result = "XX";
             }
@@ -2867,35 +2871,38 @@ namespace ENI2.Excel
             }
             else // we cannot find whatever this is..
             {
-                FixImportDialog fid = new FixImportDialog();
-                fid.Value = nationality;
-                fid.ValueType = "Nationality";
-                fid.SelectionValues = CREW.NationalityDict;
-                if (fid.ShowDialog() ?? false)
+                if (setPlaceHolder) // only show import dialog if this is a required field..
                 {
-                    if (!fid.SelectedValue.IsNullOrEmpty())
+                    FixImportDialog fid = new FixImportDialog();
+                    fid.Value = nationality;
+                    fid.ValueType = "Nationality";
+                    fid.SelectionValues = CREW.NationalityDict;
+                    if (fid.ShowDialog() ?? false)
                     {
-                        if(!ValueMapping.InvalidKeys[ValueMapping.MappingType.COUNTRY].Contains(nationality))
+                        if (!fid.SelectedValue.IsNullOrEmpty())
                         {
-                            string selectedValue = fid.SelectedValue;
-                            Task<bool> createResult = Task.Run(async () => await ValueMapping.Create(ValueMapping.MappingType.COUNTRY, nationality, selectedValue));
-                            if(!createResult.Result)
-                                _log.WarnFormat("Error saving nationality value mapping {0} -> {1}", nationality, selectedValue);
+                            if (!ValueMapping.InvalidKeys[ValueMapping.MappingType.COUNTRY].Contains(nationality))
+                            {
+                                string selectedValue = fid.SelectedValue;
+                                Task<bool> createResult = Task.Run(async () => await ValueMapping.Create(ValueMapping.MappingType.COUNTRY, nationality, selectedValue));
+                                if (!createResult.Result)
+                                    _log.WarnFormat("Error saving nationality value mapping {0} -> {1}", nationality, selectedValue);
+                            }
+                            else
+                            {
+                                // add temporary
+                                ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.COUNTRY);
+                                vm.Key = nationality;
+                                vm.Value = fid.SelectedValue;
+                                ValueMapping.Dicts[ValueMapping.MappingType.COUNTRY].Add(nationality, vm);
+                            }
+                            result = fid.SelectedValue.Substring(0, 2); // attention manual entry
                         }
-                        else
-                        {
-                            // add temporary
-                            ValueMapping vm = ValueMapping.Create(ValueMapping.MappingType.COUNTRY);
-                            vm.Key = nationality;
-                            vm.Value = fid.SelectedValue;
-                            ValueMapping.Dicts[ValueMapping.MappingType.COUNTRY].Add(nationality, vm);
-                        }
-                        result = fid.SelectedValue.Substring(0, 2); // attention manual entry
                     }
-                }
-                else
-                {
-                    canceled = true;
+                    else
+                    {
+                        canceled = true;
+                    }
                 }
             }
 
diff --git a/ENI2/ILLink/ILLink.Descriptors.LibraryBuild.xml b/ENI2/ILLink/ILLink.Descriptors.LibraryBuild.xml
new file mode 100644
index 00000000..a42d7f0e
--- /dev/null
+++ b/ENI2/ILLink/ILLink.Descriptors.LibraryBuild.xml
@@ -0,0 +1,8 @@
+<linker>
+  <assembly fullname="System.Diagnostics.DiagnosticSource">
+    <type fullname="System.Diagnostics.Metrics.MetricsEventSource">
+      <!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
+      <method name="GetInstance" />
+    </type>
+  </assembly>
+</linker>
diff --git a/ENI2/Properties/Settings.Designer.cs b/ENI2/Properties/Settings.Designer.cs
index 1767a0a9..6e0990e9 100644
--- a/ENI2/Properties/Settings.Designer.cs
+++ b/ENI2/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace ENI2.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -80,16 +80,6 @@ namespace ENI2.Properties {
             }
         }
         
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nswtest;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpass" +
-            "wd;Persist Security Info=False;Connection Reset=false")]
-        public string ConnectionString {
-            get {
-                return ((string)(this["ConnectionString"]));
-            }
-        }
-        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("825")]
@@ -185,5 +175,15 @@ namespace ENI2.Properties {
                 this["W3Top"] = value;
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Initial Catalog=nsw;Data Source=192.168.2.24\\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;P" +
+            "ersist Security Info=False;Connection Reset=false")]
+        public string ConnectionString {
+            get {
+                return ((string)(this["ConnectionString"]));
+            }
+        }
     }
 }
diff --git a/ENI2/Properties/Settings.settings b/ENI2/Properties/Settings.settings
index b0c246d1..90582769 100644
--- a/ENI2/Properties/Settings.settings
+++ b/ENI2/Properties/Settings.settings
@@ -20,9 +20,6 @@
     <Setting Name="ReportAuthor" Type="System.String" Scope="Application">
       <Value Profile="(Default)">BSMD ReportGenerator</Value>
     </Setting>
-    <Setting Name="ConnectionString" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
-    </Setting>
     <Setting Name="Width" Type="System.String" Scope="User">
       <Value Profile="(Default)">825</Value>
     </Setting>
@@ -47,5 +44,8 @@
     <Setting Name="W3Top" Type="System.String" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
+    <Setting Name="ConnectionString" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/ENI2/packages.config b/ENI2/packages.config
index 1efc695f..f217452e 100644
--- a/ENI2/packages.config
+++ b/ENI2/packages.config
@@ -4,24 +4,24 @@ Sample license text.
 -->
 <packages>
   <package id="ExcelDataReader" version="3.7.0" targetFramework="net48" />
-  <package id="Extended.Wpf.Toolkit" version="4.6.1" targetFramework="net48" />
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="8.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging" version="8.0.1" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.2" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net48" />
+  <package id="Extended.Wpf.Toolkit" version="4.7.25103.5738" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="9.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="9.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="9.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="9.0.2" targetFramework="net48" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net48" />
   <package id="PDFsharp-MigraDoc-GDI" version="6.1.1" targetFramework="net48" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.117.0" targetFramework="net48" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
-  <package id="System.Data.SQLite.Core" version="1.0.117.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
+  <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.2" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/ENI2/x64/SQLite.Interop.dll b/ENI2/x64/SQLite.Interop.dll
index 0736a584..884b2d4b 100644
Binary files a/ENI2/x64/SQLite.Interop.dll and b/ENI2/x64/SQLite.Interop.dll differ
diff --git a/ENI2/x86/SQLite.Interop.dll b/ENI2/x86/SQLite.Interop.dll
index d4570e55..98e74c4f 100644
Binary files a/ENI2/x86/SQLite.Interop.dll and b/ENI2/x86/SQLite.Interop.dll differ
diff --git a/SendNSWMessageService/SendNSWMessageService.csproj b/SendNSWMessageService/SendNSWMessageService.csproj
index 7e10e56b..601d610a 100644
--- a/SendNSWMessageService/SendNSWMessageService.csproj
+++ b/SendNSWMessageService/SendNSWMessageService.csproj
@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/SendNSWMessageService/packages.config b/SendNSWMessageService/packages.config
index 6bae6f53..fbd6f896 100644
--- a/SendNSWMessageService/packages.config
+++ b/SendNSWMessageService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.LockingService/bsmd.LockingService.csproj b/bsmd.LockingService/bsmd.LockingService.csproj
index a1b9cc55..18d2d500 100644
--- a/bsmd.LockingService/bsmd.LockingService.csproj
+++ b/bsmd.LockingService/bsmd.LockingService.csproj
@@ -46,8 +46,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/bsmd.LockingService/bsmd.LockingService.csproj.user b/bsmd.LockingService/bsmd.LockingService.csproj.user
index 3517ad61..6c90db82 100644
--- a/bsmd.LockingService/bsmd.LockingService.csproj.user
+++ b/bsmd.LockingService/bsmd.LockingService.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
diff --git a/bsmd.LockingService/packages.config b/bsmd.LockingService/packages.config
index 6bae6f53..fbd6f896 100644
--- a/bsmd.LockingService/packages.config
+++ b/bsmd.LockingService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.dakosy/bsmd.dakosy.csproj b/bsmd.dakosy/bsmd.dakosy.csproj
index 54ab41d4..29eaa4ac 100644
--- a/bsmd.dakosy/bsmd.dakosy.csproj
+++ b/bsmd.dakosy/bsmd.dakosy.csproj
@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -52,8 +52,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WinSCPnet, Version=1.15.0.14991, Culture=neutral, PublicKeyToken=2271ec4a3c56d0bf, processorArchitecture=MSIL">
-      <HintPath>..\packages\WinSCP.6.3.5\lib\net40\WinSCPnet.dll</HintPath>
+    <Reference Include="WinSCPnet, Version=1.15.0.15131, Culture=neutral, PublicKeyToken=2271ec4a3c56d0bf, processorArchitecture=MSIL">
+      <HintPath>..\packages\WinSCP.6.3.7\lib\net40\WinSCPnet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -93,12 +93,12 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\WinSCP.6.3.5\build\WinSCP.targets" Condition="Exists('..\packages\WinSCP.6.3.5\build\WinSCP.targets')" />
+  <Import Project="..\packages\WinSCP.6.3.7\build\WinSCP.targets" Condition="Exists('..\packages\WinSCP.6.3.7\build\WinSCP.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\WinSCP.6.3.5\build\WinSCP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinSCP.6.3.5\build\WinSCP.targets'))" />
+    <Error Condition="!Exists('..\packages\WinSCP.6.3.7\build\WinSCP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WinSCP.6.3.7\build\WinSCP.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/bsmd.dakosy/packages.config b/bsmd.dakosy/packages.config
index 72eb65c9..20b6f274 100644
--- a/bsmd.dakosy/packages.config
+++ b/bsmd.dakosy/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
-  <package id="WinSCP" version="6.3.5" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
+  <package id="WinSCP" version="6.3.7" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.database/BKRA.cs b/bsmd.database/BKRA.cs
index b6ed9494..063f21fa 100644
--- a/bsmd.database/BKRA.cs
+++ b/bsmd.database/BKRA.cs
@@ -31,7 +31,7 @@ namespace bsmd.database
 
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
-        [MaxLength(100)]
+        [MaxLength(25)]
         [ENI2Validation]
         public string BunkerFuelType { get; set; }
 
diff --git a/bsmd.database/BRKD.cs b/bsmd.database/BRKD.cs
index 80ea0278..487bce7b 100644
--- a/bsmd.database/BRKD.cs
+++ b/bsmd.database/BRKD.cs
@@ -31,7 +31,7 @@ namespace bsmd.database
 
         [ShowReport]
         [Validation(ValidationCode.NOT_NULL)]
-        [MaxLength(100)]
+        [MaxLength(25)]
         [ENI2Validation]
         public string BunkerFuelType { get; set; }
 
diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index 47c8a970..f576d7b4 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -44,12 +44,10 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Place of birth")]
-        [Validation(ValidationCode.NOT_NULL)]
         [MaxLength(100)]
         [ENI2Validation]
         public string CrewMemberPlaceOfBirth { get; set; }
-
-        [Validation(ValidationCode.FLAG_CODE)]
+        
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberCountryOfBirth { get; set; }
@@ -83,7 +81,7 @@ namespace bsmd.database
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberNationality { get; set; }
-        
+
         [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
         public byte? CrewMemberIdentityDocumentType { get; set; }
@@ -122,7 +120,7 @@ namespace bsmd.database
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberIdentityDocumentIssuingState { get; set; }
-        
+
         [Validation(ValidationCode.PAST_DATE)]
         [ENI2Validation]
         public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }
@@ -325,12 +323,12 @@ namespace bsmd.database
             }
 
             if (this.CrewMemberDateOfBirth.HasValue && (this.CrewMemberDateOfBirth.Value > DateTime.Today))
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Date of birth is in the future", null, this.Title, this.Identifier, this.IsDeparture ? "CREWD" : "CREWA"));            
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Date of birth is in the future", null, this.Title, this.Identifier, this.IsDeparture ? "CREWD" : "CREWA"));
 
             if (this.CrewMemberDateOfBirth.HasValue && (this.CrewMemberDateOfBirth.Value <= CLAMPMINDATE))
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.TIME_IMPLAUSIBLE, "Check date of birth", null, this.Title, this.Identifier, this.IsDeparture ? "CREWD" : "CREWA"));
 
-            // NSW 7.2 rules            
+            // NSW 7.2 rules
 
             if((this.NotificationSchengen ?? false) && (!this.HasSchengenDetails))
             {
@@ -383,14 +381,14 @@ namespace bsmd.database
                 row[5] = crew.CrewMemberGender ?? (object)DBNull.Value;
                 if (crew.CrewMemberNationality?.Length == 2)
                     row[6] = crew.CrewMemberNationality;
-                else 
+                else
                     row[6] = DBNull.Value;
                 row[7] = crew.CrewMemberIdentityDocumentType ?? (object)DBNull.Value;
                 row[8] = crew.CrewMemberIdentityDocumentId ?? (object)DBNull.Value;
                 row[9] = crew.CrewMemberVisaNumber ?? (object)DBNull.Value;
                 row[10] = crew.CrewMemberDuty ?? (object)DBNull.Value;
                 row[11] = crew.Identifier ?? (object)DBNull.Value;
-                row[12] = crew.IsDeparture;                
+                row[12] = crew.IsDeparture;
                 if (crew.CrewMemberIdentityDocumentIssuingState?.Length == 2)
                     row[13] = crew.CrewMemberIdentityDocumentIssuingState;
                 else
@@ -449,7 +447,7 @@ namespace bsmd.database
             this.CrewMemberIdentityDocumentType = crew.CrewMemberIdentityDocumentType;
             this.CrewMemberIdentityDocumentId = crew.CrewMemberIdentityDocumentId;
             this.CrewMemberVisaNumber = crew.CrewMemberVisaNumber;
-            this.CrewMemberDuty = crew.CrewMemberDuty;            
+            this.CrewMemberDuty = crew.CrewMemberDuty;
             this.CrewMemberIdentityDocumentIssuingState = crew.CrewMemberIdentityDocumentIssuingState;
             this.CrewMemberIdentityDocumentExpiryDate = crew.CrewMemberIdentityDocumentExpiryDate;
             this.Effects = crew.Effects;
@@ -463,7 +461,7 @@ namespace bsmd.database
 
         public static CREW CreateCommon(List<CREW> crewList)
         {
-            CREW crew = new CREW(); // template entity            
+            CREW crew = new CREW(); // template entity
 
             if(crewList.IsNullOrEmpty())
                 return crew;
diff --git a/bsmd.database/IBCPosition.cs b/bsmd.database/IBCPosition.cs
index 9880923d..2a9d73f6 100644
--- a/bsmd.database/IBCPosition.cs
+++ b/bsmd.database/IBCPosition.cs
@@ -266,6 +266,10 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
+
+            if(this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
             if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value == 2) &&
             this.Flashpoint_CEL.IsNullOrEmpty())
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.V804, "Flashpoint_CEL", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
diff --git a/bsmd.database/IGCPosition.cs b/bsmd.database/IGCPosition.cs
index 23fa5a6e..de9e39c7 100644
--- a/bsmd.database/IGCPosition.cs
+++ b/bsmd.database/IGCPosition.cs
@@ -201,6 +201,9 @@ namespace bsmd.database
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
 
+            if(this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
             if (!this.UNNumber.IsNullOrEmpty() && !unNumberRegex.IsMatch(this.UNNumber))
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "UNNumber", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
 
diff --git a/bsmd.database/IMDGPosition.cs b/bsmd.database/IMDGPosition.cs
index e8d4eef5..b4a8ba25 100644
--- a/bsmd.database/IMDGPosition.cs
+++ b/bsmd.database/IMDGPosition.cs
@@ -139,14 +139,17 @@ namespace bsmd.database
 
         [ShowReport]
         [ENI2Validation]
+        [Validation(ValidationCode.DOUBLE_GT_ZERO)]
         public double? NetQuantity_KGM { get; set; }
 
         [ShowReport]
         [ENI2Validation]
+        [Validation(ValidationCode.DOUBLE_GT_ZERO)]
         public double? GrossQuantity_KGM { get; set; }
 
         [ShowReport]
         [ENI2Validation]
+        [Validation(ValidationCode.DOUBLE_GT_ZERO)]
         public double? Volume_MTQ { get; set; }
 
         [ShowReport]
@@ -496,7 +499,7 @@ namespace bsmd.database
             if((this.NetQuantity_KGM >= 1000000000) ||
                 (this.GrossQuantity_KGM >= 1000000000) ||
                 (this.Volume_MTQ >= 1000000000))
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.V809, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
 
 
             foreach (SubsidiaryRisks sr in this.SubsidiaryRiskList)
diff --git a/bsmd.database/IMSBCPosition.cs b/bsmd.database/IMSBCPosition.cs
index 7af88032..a510b4a7 100644
--- a/bsmd.database/IMSBCPosition.cs
+++ b/bsmd.database/IMSBCPosition.cs
@@ -235,7 +235,10 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
-            if(!MHB ?? false)
+            if(this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
+            if (!MHB ?? false)
             {
                 if(this.UNNumber.IsNullOrEmpty())
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V803, "UNNumber", this.UNNumber, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
diff --git a/bsmd.database/MARPOL_Annex_I_Position.cs b/bsmd.database/MARPOL_Annex_I_Position.cs
index 352af5b6..252c0da8 100644
--- a/bsmd.database/MARPOL_Annex_I_Position.cs
+++ b/bsmd.database/MARPOL_Annex_I_Position.cs
@@ -188,6 +188,9 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
+            if (this.Quantity_KGM >= 1000000000)
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, null, null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+
             if (this.FlashpointInformation.HasValue && (this.FlashpointInformation.Value == 2) &&
             this.Flashpoint_CEL.IsNullOrEmpty())
                 violations.Add(RuleEngine.CreateViolation(ValidationCode.V804, "Flashpoint_CEL", null, this.Title, this.Identifier,
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index 010b0109..537fe711 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -44,8 +44,7 @@ namespace bsmd.database
         public string PassengerFirstName { get; set; }
 
         [ShowReport]
-        [ReportDisplayName("Place of birth")]
-        [Validation(ValidationCode.NOT_NULL)]
+        [ReportDisplayName("Place of birth")]        
         [MaxLength(100)]
         [ENI2Validation]
         public string PassengerPlaceOfBirth { get; set; }
@@ -150,8 +149,7 @@ namespace bsmd.database
 
         [ENI2Validation]
         public bool? NotificationPAX { get; set; }
-
-        [Validation(ValidationCode.FLAG_CODE)]
+        
         [MaxLength(2)]
         [ENI2Validation]
         public string PassengerCountryOfBirth { get; set; }
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 61cfd89a..fced6f80 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.2.5")]
-[assembly: AssemblyCopyright("Copyright ©  2014-2024 schick Informatik")]
+[assembly: AssemblyInformationalVersion("7.2.6")]
+[assembly: AssemblyCopyright("Copyright ©  2014-2025 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 2d216e85..3521bcaa 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.2.5.*")]
+[assembly: AssemblyVersion("7.2.6.*")]
 
diff --git a/bsmd.database/bsmd.database.csproj b/bsmd.database/bsmd.database.csproj
index f79ab14f..2fa7966e 100644
--- a/bsmd.database/bsmd.database.csproj
+++ b/bsmd.database/bsmd.database.csproj
@@ -89,8 +89,8 @@
     <UseWinFormsOutOfProcDesigner>False</UseWinFormsOutOfProcDesigner>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\ENI2\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -210,7 +210,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/bsmd.database/packages.config b/bsmd.database/packages.config
index bea231e4..21dbfcbd 100644
--- a/bsmd.database/packages.config
+++ b/bsmd.database/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.dbh/Request/NSWRequest.cs b/bsmd.dbh/Request/NSWRequest.cs
index 979cfa67..9f828a73 100644
--- a/bsmd.dbh/Request/NSWRequest.cs
+++ b/bsmd.dbh/Request/NSWRequest.cs
@@ -249,7 +249,7 @@ namespace bsmd.dbh.Request
     {
 
         /// <remarks/>
-        [System.Xml.Serialization.XmlEnumAttribute("7.2")]
+        [System.Xml.Serialization.XmlEnumAttribute("7.2.1")]
         Item72,
     }
 
diff --git a/bsmd.dbh/RequestUtil.cs b/bsmd.dbh/RequestUtil.cs
index 5db6f503..f54fd017 100644
--- a/bsmd.dbh/RequestUtil.cs
+++ b/bsmd.dbh/RequestUtil.cs
@@ -4,9 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Serialization;
 using bsmd.database;
 using log4net;
@@ -26,7 +23,7 @@ namespace bsmd.dbh
             {
                 Root root = new Root();
                 root.Version = RootVersion.Item72;
-                root.SourceDocumentVersion = "7.2";
+                root.SourceDocumentVersion = "7.2.1";
                 root.Timestamp = DateTime.Now;
                 string filenameComponent;
 
diff --git a/bsmd.dbh/bsmd.dbh.csproj b/bsmd.dbh/bsmd.dbh.csproj
index ff276913..586cd681 100644
--- a/bsmd.dbh/bsmd.dbh.csproj
+++ b/bsmd.dbh/bsmd.dbh.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.dbh/packages.config b/bsmd.dbh/packages.config
index 6bae6f53..fbd6f896 100644
--- a/bsmd.dbh/packages.config
+++ b/bsmd.dbh/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.hisnord/bsmd.hisnord.csproj b/bsmd.hisnord/bsmd.hisnord.csproj
index e58130bf..59e52532 100644
--- a/bsmd.hisnord/bsmd.hisnord.csproj
+++ b/bsmd.hisnord/bsmd.hisnord.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.hisnord/packages.config b/bsmd.hisnord/packages.config
index 6bae6f53..fbd6f896 100644
--- a/bsmd.hisnord/packages.config
+++ b/bsmd.hisnord/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.hisnord/transmitter.cs b/bsmd.hisnord/transmitter.cs
index 62439e54..2f7c62cb 100644
--- a/bsmd.hisnord/transmitter.cs
+++ b/bsmd.hisnord/transmitter.cs
@@ -38,7 +38,7 @@ namespace bsmd.hisnord
                 startInfo.RedirectStandardError = true;
                 startInfo.RedirectStandardOutput = true;
                 startInfo.RedirectStandardInput = false;
-                startInfo.UseShellExecute = false;                
+                startInfo.UseShellExecute = false;
 
                 using (Process transmitterProcess = new Process())
                 {
@@ -57,7 +57,7 @@ namespace bsmd.hisnord
                     processId = transmitterProcess.Id;
 
                     // _log.DebugFormat("started {0}", transmitterProcess.ProcessName);
-                    int timeout = Properties.Settings.Default.BatchTimeoutMins * 1000 * 60; // convert to ms                
+                    int timeout = Properties.Settings.Default.BatchTimeoutMins * 1000 * 60; // convert to ms
 
                     _log.DebugFormat($"starting transmitter, process ID: {processId}, timeout {timeout} ms.");
 
@@ -75,6 +75,26 @@ namespace bsmd.hisnord
                             _log.Warn($"Killing Transmitter {processId} failed: {e.Message}");
                         }
                     }
+                    else
+                    {
+                        int exitCode = transmitterProcess.ExitCode;
+                        if (exitCode != 0)
+                        {
+                            string errorText = "";
+                            switch(exitCode)
+                            {
+                                case 1: errorText = "Schema violation"; break;
+                                case 2:
+                                case 3: errorText = "Element must not be null"; break;
+                                case 1000: errorText = "Internal error"; break;
+                                case 1001: errorText = "Access denied - Login"; break;
+                                case 1004: errorText = "Access denied - Internal Configuration"; break;
+                                case 1005: errorText = "Internal configuration error"; break;
+                                case 2000: errorText = "File not found"; break;
+                            }
+                            _log.ErrorFormat("Transmitter returned code {0}: {1}", exitCode, errorText);
+                        }
+                    }
                 }
                 return true;
             }
@@ -96,7 +116,7 @@ namespace bsmd.hisnord
             // Output of STDERR. HIS-Nord seems to be using this for logging, so we do not flag as error.
             if(!e.Data.IsNullOrEmpty())
                 _log.Debug(e.Data);
-        }        
+        }
 
         private static void TransmitterProcess_Exited(object sender, EventArgs e)
         {
@@ -137,12 +157,12 @@ namespace bsmd.hisnord
                     }
                 }
                 _log.Info($"deleted {cnt} files from {Properties.Settings.Default.OutputArchiveDir}");
-                
+
             }
             catch(Exception ex)
             {
                 _log.ErrorFormat("Error trying to delete old files: {0}", ex.Message);
             }
-        }        
+        }
     }
 }
diff --git a/bsmd.status/bsmd.status.csproj b/bsmd.status/bsmd.status.csproj
index e7d708ed..f5f852ba 100644
--- a/bsmd.status/bsmd.status.csproj
+++ b/bsmd.status/bsmd.status.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=3.0.1.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.3.0.1\lib\net462\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=3.0.4.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.3.0.4\lib\net462\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.status/packages.config b/bsmd.status/packages.config
index 6bae6f53..fbd6f896 100644
--- a/bsmd.status/packages.config
+++ b/bsmd.status/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="3.0.1" targetFramework="net48" />
+  <package id="log4net" version="3.0.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/misc/GEFAHRGUTLISTE.csv b/misc/GEFAHRGUTLISTE.csv
index 9e43f074..a87416b5 100644
--- a/misc/GEFAHRGUTLISTE.csv
+++ b/misc/GEFAHRGUTLISTE.csv
@@ -1,72 +1,72 @@
-Beschreibung;Gefahr;HAZARD_ENUM;FP;FP_ENUM;15.19?;Typ;IMSBC;MHB;IMSBC_MHB;Group;IMSBC_HAZ;UN-Nr.;IMO-Cl.;IBC;POLLUTION_CATEGORY_ENUM;MARPOL;IGC;FP_IBC;Bemerkung
-1,3 Pentadiene / Piperylene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Acetic acid     ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Z);2;;;;
-Acetic acid glacial;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Z);2;;;;
-Acetone  ;;;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-Acrylonitrile (ACN)  ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Beschreibung;Gefahr;HAZARD_ENUM;FP;FP_ENUM;15.19?;Typ;IMSBC;MHB;IMSBC_MHB;Group;IMSBC_HAZ;UN-Nr.;IMO-Cl.;IBC;POLLUTION_CATEGORY_ENUM;MARPOL;IGC;FP_IBC;Bemerkung
+1,3 Pentadiene / Piperylene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Acetic acid     ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Z);2;;;;
+Acetic acid glacial;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Z);2;;;;
+Acetone  ;;;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Acrylonitrile (ACN)  ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
 Alcoholic beverages, n.o.s. (Wine);;;;; ;IBC;;;;;;;;x (Z);2;;;;
-Alkanes (C6-C9);S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
-n-Alkanens (C10+)      ;;;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-Alkylate;;;<60°C;2; ;MARPOL;;;;;;;;;;x;;6;
-Alumina hydrate;;;;;;IMSBC;x;y;;A/B;2;;;;;;;;
-alpha-Methylstyrene        ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Alkanes (C6-C9);S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
+n-Alkanens (C10+)      ;;;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+Alkylate;;;<60°C;2; ;MARPOL;;;;;;;;;;x;;6;
+Alumina hydrate / Aluminiumhydroxid;;;;;;IMSBC;x;y;;A/B;;;;;;;;;
+alpha-Methylstyrene        ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Ammonia aqueous (28% or less);S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;NF;
-Ammonia / Anhydrous / Ammoniak;;;;; ;IGC;;;;;;1005;02. Mrz;;;;x;;
+Ammonia / Anhydrous / Ammoniak;;;;; ;IGC;;;;;;1005;2.3;;;;x;;
 Ammoniak Liquid 24,5%    ;S/P;2;;;Ja;IBC;;;;;;;;x (Y);1;;;;
-Ammonium Nitrate Fertilizer ;;;;; ;IMSBC;x;;;B;1;2067;05. Jan;;;;;;
-Ammonium Nitrate with not more than 0,2% total;;;;; ;IMSBC;x;;;B;1;1942;05. Jan;;;;;;
-Ammonium Polyphosphate Solution  (APP) ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Ammonium Nitrate Fertilizer ;;;;; ;IMSBC;x;;;B;1;2067;5.1;;;;;;
+Ammonium Nitrate with not more than 0,2% total;;;;; ;IMSBC;x;;;B;1;1942;5.1;;;;;;
+Ammonium Polyphosphate Solution  (APP) ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
 Ammonium Sulphate;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Ammonium nitrate solution (93% or less)       ;S/P;2;NF;0;Nein;IBC;;;;;;;;x (Y);1;;;;
 Ammonium thiosulphate solution (60% or less);S/P;2;NF;0;Nein;IBC;;;;;;;;x (Z);2;;;;
-Aniline      ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-Anthracene Oil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Aniline      ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+Anthracene Oil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Anthracite / Coal / Kohle;;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;Gruppe: B (und A)
-ATRES / RAT / Atmospheric Residues / Residues (petroleum) atmospheric   (APS Bottoms Resid A);;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
+ATRES / RAT / Atmospheric Residues / Residues (petroleum) atmospheric   (APS Bottoms Resid A);;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
 AVGAS / Aviation Gasoline / Flugbenzin;;;;;;MARPOL;;;;;;;;;;x;;;
 BALED RDF;;;;;;IMSBC;x ;y;;B;1;;;;;;;;
-Base Oil / Lubricating oil / SN150/ SN500 / SN900 / BS20 / NYTEX 4700 / T9 / T600 / T150 ANR / VISOM 4 / Ultra S4 / Bright Stock / QHVI4 / QHVI8  / VHVI-4 = DISTILLATES (PETROLEUM) / HYDROTREATED HEAVY PARAFFINIC,;;;>60°C;1; ;MARPOL;;;;;;;;;;x;;;
-Benzene / Benzol;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;-11;
-Biodiesel / FAME - Fatty acid methyl esters;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;1;;;;
-Bitumen ;;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
-Blei in Blöcken / Lead Ingots;;;;;;;;;;;;;;;;;;; kein Gefahrgut! Aussage Herr Jnassen Rhenus Midgard Nordenham (tel. 21.07.2021)
-Butan;;;;;;IGC;;;;;;1011;02. Jan;;;;x;;
-Butene / Buthylen;;;;;;IGC;;;;;;1012;02. Jan;;;;x;;
-Butyl acrylate (all isomers);S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Base Oil / Lubricating oil / SN150/ SN500 / SN900 / BS20 / NYTEX 4700 / T9 / T600 / T150 ANR / VISOM 4 / Ultra S4 / Bright Stock / QHVI4 / QHVI8  / VHVI-4 = DISTILLATES (PETROLEUM) / HYDROTREATED HEAVY PARAFFINIC,;;;>60°C;1; ;MARPOL;;;;;;;;;;x;;;
+Benzene / Benzol;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;-11;
+Biodiesel / FAME - Fatty acid methyl esters;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Bitumen ;;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
+Blei in Blöcken / Lead Ingots;;;;;;;;;;;;;;;;;;; kein Gefahrgut! Aussage Herr Jnassen Rhenus Midgard Nordenham (tel. 21.07.2021)
+Butan;;;;;;IGC;;;;;;1011;2.1;;;;x;;
+Butene / Buthylen;;;;;;IGC;;;;;;1012;2.1;;;;x;;
+Butyl acrylate (all isomers);S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Calcined clay / Kalzinierter Ton;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-C9 Petroleum Resin;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+C9 Petroleum Resin;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Calcium Ammonium Nitrate 27% N / CAN (in Big BAG);;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Aussage von Wasserschutzpolizeit Hamburg
 Calcium Ammonium Nitrate 27% N / CAN (in BULK);;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-Calcium Chloride Solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
-CARBON BLACK FEEDSTOCK / D8 / ANTHRACENE OIL;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;x;;;nach Sicherheitsdatenblatt fragen kann IBC oder Marpol sein
+Calcium Chloride Solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+CARBON BLACK FEEDSTOCK / D8 / ANTHRACENE OIL;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;x;;;nach Sicherheitsdatenblatt fragen kann IBC oder Marpol sein
 Carbon Black Oil Propylene Oxide;;;;;;MARPOL;;;;;;;;;;x;;;
-Carbon Dioxide;;;;; ;IGC;;;;;;1013;02. Feb;;;;x;;
-Caromax 28      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Carbon Dioxide;;;;; ;IGC;;;;;;1013;2.2;;;;x;;
+Caromax 28      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Caustic potash / Potassium hydroxide solution / Kalilauge      ;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;;
 Caustic soda / Sodium hydroxide solution / Natronlauge;S/P;2;NF;0; Ja;IBC;;;;;;;;x (Y);1;;;;
 China Clay;;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Aussage von Herrn Schlicht (S+B) in Absprache mit Wasserschutz
 Clay / TON;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-Chloroform      ;S/P;2;NF;0;Nein;IBC;;;;;;;;x (Y);1;;;;
-Coal Tar       ,;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
-Coal Tar Pitch (Flüssig);S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Coal / Kohle / Anthracite;;;;;;IMSBC;x;y;;A/B;2;;;;;;;;Gruppe: B (und A)
+Coal Tar       ,;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Coal Tar Pitch (Flüssig);S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Coal Tar Pitch / Steinkohlenteerpech (FEST);;;;;;IMSBC;x;y;;B;1;;;;;;;;
-Coconut oil      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-COKE BREEZE / Koksgrus;;;;; ;IMSBC;x;;;A;0;;;;;;;;"NICHT MHB + KEINE UN-Nummer!  Mit UN-Nr. ""0000"" + IMO-class ""1.1"" eingeben + Vermerk: ""UN-no. + IMO-class not available"" (im Jgegis muss es mit ""MHB"" angemeldet werden) - GR. A"
-Used cooking oil (mit Triglycerides, C16-C18 and C18 unsaturated)      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Used cooking oil (wenn Triglycerides nicht ausdrücklich ausgewiesen)      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Coconut oil      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+COKE BREEZE / Koksgrus;;;;; ;IMSBC;x;;;A;0;;;;;;;;
+Used cooking oil (mit Triglycerides, C16-C18 and C18 unsaturated)      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Used cooking oil (wenn Triglycerides nicht ausdrücklich ausgewiesen)      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Copper concentrates ;;;;; ;IMSBC;x;;;A;0;3077;9;;;;;;
 Copper concentrates (Metal Sulphide Concentrates);;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;
-Corn Oil    ,  ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Creosete Oil      ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (X);0;;;;
-Crude Benzene and mixtures having 10% benzene or more ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Cumene / Isopropylbenzene ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (y);1;;;;
+Corn Oil    ,  ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Creosete Oil      ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (X);0;;;;
+Crude Benzene and mixtures having 10% benzene or more ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Cumene / Isopropylbenzene ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (y);1;;;;
 Cutterstock / Cutter;;;;; ;MARPOL;;;;;;;;;;x;;;
-Cyclohexane;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Cyclohexane;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 DDGS Pellets / Dried Distiller Grains with solubles;;;;;;;;;;;;;;;;;;;Keine Anmeldung
-DINP DIALKYL / Diisononylphthalat;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+DINP DIALKYL / Diisononylphthalat;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Distillate Hydrocrackers / DHC;;;;; ;MARPOL;;;;;;;;;;x;;;Bottoms Raw marterial for chemical industry Feedingstock for mineral oil industry
 DIAMMONIUM PHOSPHATE / DAP;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-1,1- Dichloroethane;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+1,1- Dichloroethane;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
 DIRECT REDUCED IRON;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
 "Distillate / D10V / LVG / D8C / D10C / D10JUB / D 600 / D 700 / D 2000   
 ";;;;; ;MARPOL;;;;;;;;;;x;;;
@@ -74,225 +74,225 @@ DOLOMITE;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C, evtl. Ist auch Dolo
 Dolomitic quicklime;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
 Eisen II Sulphat;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Eisensilikat granulat / Iron Silicate Granules;;;;;;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-Energy Rich Fuel / Neste Renewable Diesel / NExBTL / HVO / Hydrotreated Vegetable Oils;;;>60°C;1;;;;;;;;;;;;;;;siehe Bemerkung NExBTL - Renewable Diesel
-Ethyl acetate       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-Ethanol / Ethyl alcohol / Grain alcohol / Drinking alcohol;;;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-Ethylene glycol / (Mono-)Ethylenglycol / MEG / Glycol;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
-Ethyl tert-butyl ether / ETBE  ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Ethylene;;;;; ;IGC;;;;;;1038;02. Jan;;;;X;;
-ETHYLENE DICHLORIDE (ETD oder EDC) ;S/P;2;<60°C;2;Ja;IBC;;;;;;1184;;x (Y) ;;;;;
+Energy Rich Fuel / Neste Renewable Diesel / NExBTL / HVO / Hydrotreated Vegetable Oils;;;>60°C;1;;;;;;;;;;;;;;;siehe Bemerkung NExBTL - Renewable Diesel
+Ethyl acetate       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Ethanol / Ethyl alcohol / Grain alcohol / Drinking alcohol;;;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Ethylene glycol / (Mono-)Ethylenglycol / MEG / Glycol;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Ethyl tert-butyl ether / ETBE  ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Ethylene;;;;; ;IGC;;;;;;1038;2.1;;;;X;;
+ETHYLENE DICHLORIDE (ETD oder EDC) ;S/P;2;<60°C;2;Ja;IBC;;;;;;1184;;x (Y) ;;;;;
 Etibor / BORAX / PENTAHYDRATE CRUDE;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
 EXTRAIT / Vacuum gas oil;;;;;;MARPOL;;;;;;;;;;x;;;
-Fatty acids, (C16+);P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;1;;;;
-FAME / Fatty acid methyl esters / Biodiesel      ,;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;1;;;;
+Fatty acids, (C16+);P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;;;;;
+FAME / Fatty acid methyl esters / Biodiesel      ,;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
 Feed Phosphate / Monocalcium Phosphate;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Ferroalloys / Ferro Silico Mangan / Ferrolegierung (unter 20 %);;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Ferrochrom;;;;;;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-Ferrosilicochrom 40 / Ferrosilicon;;;;; ;IMSBC;x;;;B;1;1408;04. Mrz;;;;;;
-FERROUS METAL / BORINGS / SHAVINGS / TURNINGS / CUTTINGS;;;;; ;IMSBC;x;;;B;1;2793;04. Feb;;;;;;
+Ferrosilicochrom 40 / Ferrosilicon;;;;; ;IMSBC;x;;;B;1;1408;4.3;;;;;;
+FERROUS METAL / BORINGS / SHAVINGS / TURNINGS / CUTTINGS;;;;; ;IMSBC;x;;;B;1;2793;4.2;;;;;;
 FERTILIZER POTASH  (PINK GRANULATED MURIATE OF POTASH);;;;;;IMSBC;x;;;;;;;;;;;;
 Fish Meal treated with Antioxidant;;;;; ;IMSBC;x;;;B;1;2216;9;;;;;;wenn Ladehafen Bremen dann Gruppe C und nicht anzumelden
-Fishoil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;1;;;;
-Fish Silage Protein Concentrate (containing 4% or less formic acid);P;0;NF;0;Nein;IBC;;;;;;;;x (Y) ;1;;;;
+Fishoil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Fish Silage Protein Concentrate (containing 4% or less formic acid);P;0;NF;0;Nein;IBC;;;;;;;;x (Y) ;;;;;
 Fish protein concentrate (containing 4% or less formic acid);P;0;NF;0;Nein;IBC;;;;;;;;x (Z);2;;;;
 FLUORSPAR / Flussspat;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
 Fly Ash;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-Formaldehyde solutions / Formalin     ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-FORMIC ACID (85% or less acid)     ,  ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-FORMIC ACID (over 85% acid)     ,  ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
-Foundry Coke / Gießereikoks /COKE;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-Fraction C6 (containing benzene);S/P;2;>60°C;1;;IBC;;;;;;;;x (Y);1;;;;
-Gas Condensate;;;<60°C;2; ;MARPOL;;;;;;;;;;x;;;
-GAS OIL  / Light Cycle Oil;;;>60°C;1; ;MARPOL;;;;;;;;;;x;;;
+Formaldehyde solutions / Formalin     ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+FORMIC ACID (85% or less acid)     ,  ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+FORMIC ACID (over 85% acid)     ,  ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Foundry Coke / Gießereikoks /COKE;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
+Fraction C6 (containing benzene);S/P;2;>60°C;1;;IBC;;;;;;;;x (Y);1;;;;
+Gas Condensate;;;<60°C;2; ;MARPOL;;;;;;;;;;x;;;
+GAS OIL  / Light Cycle Oil;;;>60°C;1; ;MARPOL;;;;;;;;;;x;;;
 Gasoline blending stocks / Reformates / Gasoline blending stocks / polymer-fuel /Gasoline blending stocks /  alkylates-fuel;;;;; ;MARPOL;;;;;;;;;;x;;;
-Glycerine;S;1;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Glycerine;S;1;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
 Ground Colemanite;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
 Gypsum / Gips;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 HCGO / Heavy Cycle Gas Oil;;;;; ;MARPOL;;;;;;;;;;x;;;
 HFO  ;;;;;;MARPOL;;;;;;;;;;x;;;
-Holzstämme / Wooden Poles;;;;; ;IMSBC;x;y;;B;1;;;;;;;;Nur wenn unter Deck, nur wenn in Loser Schüttung!
+Holzstämme / Wooden Poles;;;;; ;IMSBC;x;y;;B;1;;;;;;;;Nur wenn unter Deck, nur wenn in Loser Schüttung!
 Hydrochloric Acid;S/P;2;NF;0;Nein;IBC;;;;;;;;x (Z);2;;;NF;
-Hydrocarbon Wax / PROWAX 312;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (X);0;;;;
+Hydrocarbon Wax / PROWAX 312;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (X);0;;;;
 Hydro Cracker Bottoms ;;;;;;MARPOL;;;;;;;;;;x;;;
-Hydrotreated Renewable Oil  ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-IFO380  ;;;>60°C;1; ;MARPOL;;;;;;;;;;x;;;
-ILMENITE CLAY / Ilmenit-Ton;;;;; ;IMSBC;x;;;;;;;;;;;;Anmerkung: Ilmenite für Nordenham= Ilmenit Sand - keine Anmeldung als GG
+Hydrotreated Renewable Oil  ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+IFO380  ;;;>60°C;1; ;MARPOL;;;;;;;;;;x;;;
+ILMENITE CLAY / Ilmenit-Ton;;;;; ;IMSBC;x;;;;;;;;;;;;Anmerkung: Ilmenite für Nordenham= Ilmenit Sand - keine Anmeldung als GG
 ILMENITE Concentrate;;;;;;IMSBC;x;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 IRON ORE / Eisenerz;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 IRON ORE / Eisenerz (FINES);;;;;;IMSBC;x;;;A;0;;;;;;;;x Kein MHB, ohne UN-/IMO-Nr. senden = geht nur im ENI  (JGegis will eine Auswahl)
-Iso- and cyclo-alkanes (C12+) / LIAV270       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Iso- and cyclo-alkanes (C10-C11+)      ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Isomerate  ;;;<60°C;2;;MARPOL;;;;;;;;;;x ;;;
-Isopentane / Pentane       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Isoprene       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-JET A1 / Normal Russian TS-1 / Kerosin / Kerosene;;;<60°C;2; ;MARPOL;;;;;;;;;;X;;;
-Kalk ungeschlöscht / LIME UNSLAKED;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
-Odourless Kerosene;;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
+Iso- and cyclo-alkanes (C12+) / LIAV270       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Iso- and cyclo-alkanes (C10-C11+)      ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Isomerate  ;;;<60°C;2;;MARPOL;;;;;;;;;;x ;;;
+Isopentane / Pentane       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Isoprene       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+JET A1 / Normal Russian TS-1 / Kerosin / Kerosene;;;<60°C;2; ;MARPOL;;;;;;;;;;X;;;
+Kalk ungeschlöscht / LIME UNSLAKED;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
+Odourless Kerosene;;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
 Kokospalmenschalen;;;;;;IMSBC;x;;;;;;;;;;;;Keine Anmeldung
-Lard / Schmalz;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Lard / Schmalz;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
 LCCS / Light Catalytically Cracked Spirit / Light Catalytically Cracked Naphtha;;;;; ;MARPOL;;;;;;;;;;x;;;
 Lecithin ;;;;;;IBC;;;;;;;;x (OS);3;;;;
 Lead Concentrate ;;;;; ;IMSBC;x;;;A;0;3077;9;;;;;;"Nachfragen ob als Mineral Concentrates (3077/9) oder METAL SULPHIDE CONCENTRATES (MHB) (""Shippers declaration for solid bulk cargos"" anfordern oder auch  ""Cargo information for solid bulk cargos"""
 Lead Concentrate (Metal Sulphide Concentrates);;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;"Nachfragen ob als Mineral Concentrates (3077/9) oder METAL SULPHIDE CONCENTRATES (MHB) (""Shippers declaration for solid bulk cargos"" anfordern oder auch  ""Cargo information for solid bulk cargos"""
 Lead Ingots;;;;;;IBC;;;;;;;; ;;;;;Keine Anmeldung lt. Aussage Herr Jnassen Rhenus Midgard Nordenham (tel. 21.07.2021)
 Light Vacuum Gas Oil / Petroleum / Petroleum Hydrocarbons;;;;;;MARPOL;;;;;;;;;;x;;;
-Ligninsulphonic Acid / Sodium Salt Solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
-Ligno Sulphonate Sodium / Sulphite Lie (Lye) ;P;0;>60°C;1; ;IBC;;;;;;;;x (Z);2;;;;
+Ligninsulphonic Acid / Sodium Salt Solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Ligno Sulphonate Sodium / Sulphite Lie (Lye) ;P;0;>60°C;1; ;IBC;;;;;;;;x (Z);2;;;;
 Lime ;;;;;;IMSBC;x;y;;B;1;;;;;;;;
 Limestone / Kalkstein;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-Liquid petroleum paraffin, fraction of C14-C17 <2% aromatics);P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Liquid petroleum paraffin, fraction of C14-C17 <2% aromatics);P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
 Lukoil / Crude Oil;;;;; ;MARPOL;;;;;;;;;;x;;;
-Magnesium Chloride Solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Magnesium Chloride Solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
 Metal Sulphide Concentrates / Zink / Blei / Silber;;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;
-Methanol / Methyl Alcohol       ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y) ;1;;;;
-Methyl Acrylate           ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
-Methyl Alcohol / Methanol        ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y) ;1;;;;
-Methyl Isobutyl Ketone       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-Methylendiphenylisocyanate / MDI / Polymethylene polyphenyl isocyanate ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y) ;1;;;;
-Methyl Methacrylate Monomer / MMM       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;1;;;;
-Methyl Tert-Butyl Ether / MTBE       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-Mixed Fatty acid / MFA;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;1;;;; 
-Mixed Xylene          ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Molasses;;;NF;0; ;IBC;;;;;;;;x (OS);3;;;;Nicht anmeldepflichtig - Ausnahme: BREMEN (lt Auskunft von Herrn Kraft 09.01.2018)//FÜR BREMEN ANMELDEN ÜBER J GEGIS - an DBH - ohne Visit ID
+Methanol / Methyl Alcohol       ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y) ;;;;;
+Methyl Acrylate           ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Methyl Alcohol / Methanol        ;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y) ;;;;;
+Methyl Isobutyl Ketone       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Methylendiphenylisocyanate / MDI / Polymethylene polyphenyl isocyanate ;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y) ;;;;;
+Methyl Methacrylate Monomer / MMM       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Methyl Tert-Butyl Ether / MTBE       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Mixed Fatty acid / MFA;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;; 
+Mixed Xylene          ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Molasses;;;NF;0; ;IBC;;;;;;;;x (OS);3;;;;Nicht anmeldepflichtig - Ausnahme: BREMEN (lt Auskunft von Herrn Kraft 09.01.2018)//FÃœR BREMEN ANMELDEN ÃœBER J GEGIS - an DBH - ohne Visit ID
 Monoammonium Phosphate / MAP;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
 Monocalcium Phosphate / MCP / Futtermittel;;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;Verpackt (IMDG) nicht anmeldepflichtig
-Monoethylen Glycol / MEG;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Monoethylen Glycol / MEG;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
 Muriate of potash / Kaliumchlorid;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-n-Alkanes (C10+) / N-Paraffine / Paraffine Normal;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-N-Butanol / N-BUTYL ALCOHOL;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-N-paraffines / N-ALKANES (C10+);P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Naphtha  ;;;<60°C;2;;MARPOL;;;;;;;;;;x;;;
-Naphthalene / Molten;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+n-Alkanes (C10+) / N-Paraffine / Paraffine Normal;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+N-Butanol / N-BUTYL ALCOHOL;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+N-paraffines / N-ALKANES (C10+);P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Naphtha  ;;;<60°C;2;;MARPOL;;;;;;;;;;x;;;
+Naphthalene / Molten;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Nepherlin Matrix 350 / Sand / Glas / Porzellan;;;;; ;;;;;;;;;;;;;;
-NESSOL 40   (Noxious liquid, F, (6) n.o.s White Spirit);P;0;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
-Nessol D40   (Noxious liquid, F, (8) n.o.s.       (siehe Noxious liquid…);P;0;<60°C;2;ja;IBC;;;;;;;; ;;;;;
-Nessol D60 ( (contains Iso- und Cycloalkanes (C10-C11)      (siehe Noxious liquid...);S/P;2;<60°C;2;Nein;IBC;;;;;;;; ;;;;;
-Nessol D100 (contains Iso- und Cycloalkanes (C12+)      ;S/P;2;<60°C;2;Nein;IBC;;;;;;;; ;;;;;
-NExBTL / Renewable Diesel;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;>60;Risks: nicht zu finden in IBC-Code
-Refinery NexTAME / Noxious liquid, F, (4) n.o.s. (trade name ...., contains ....)    ;;;<60°C;2;Ja;IBC;;;;;;;;x (X);0;;;;
+NESSOL 40   (Noxious liquid, F, (6) n.o.s White Spirit);P;0;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Nessol D40   (Noxious liquid, F, (8) n.o.s.       (siehe Noxious liquid…);P;0;<60°C;2;ja;IBC;;;;;;;; ;;;;;
+Nessol D60 ( (contains Iso- und Cycloalkanes (C10-C11)      (siehe Noxious liquid...);S/P;2;<60°C;2;Nein;IBC;;;;;;;; ;;;;;
+Nessol D100 (contains Iso- und Cycloalkanes (C12+)      ;S/P;2;<60°C;2;Nein;IBC;;;;;;;; ;;;;;
+NExBTL / Renewable Diesel;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;>60;Risks: nicht zu finden in IBC-Code
+Refinery NexTAME / Noxious liquid, F, (4) n.o.s. (trade name ...., contains ....)    ;;;<60°C;2;Ja;IBC;;;;;;;;x (X);0;;;;
 Nickelconzentrat  ;;;;;;IMSBC;x;;;A;0;;;;;;;;
 Nitric acid (70% and over)          ;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;;
 Nitric acid (less than 70%)          ;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;;
-Nonene / All Isomers;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;siehe auch Propylene Trimer
+Nonene / All Isomers;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;siehe auch Propylene Trimer
 NON OXY EBOB / Gasoline;;;;;;MARPOL;;;;;;;;;;x;;;
 Normal Russian TS-1 Kerosene;;;;;;MARPOL;;;;;;;;;;x;;>23;
-"Noxious liquid, NF, (5) n.o.s. / Trade Name (Nexbase  3050;3020;3030,3043) / Containscontains Iso- and cyclo-alkanes       ";P;0;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-Noxious liquid, NF(5) n.o.s. LI 220 HF contains White Spirit, low     ;P;0;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
-Noxious liquid, NF(5) n.o.s.(Solvesso 100, contains Alkyl (C3-C4) benzenes)    ;P;0;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
-Noxious liquid, NF, (7) n.o.s. (Exxsol D80 , contains iso-and cycloalkanes(C12+));P;0;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-Noxious liquid, NF, (7) n.o.s. ((EXXSOL D60 und auch Nessol D60, contains iso-and cycloalkanes (C10-C11));P;0;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
-Noxious liquid, F, (8) n.o.s. (NESSOL D40 contains Iso- and cycloalkanes (C10-C11)) ;P;0;<60°C;2;ja;IBC;;;;;;;;x (Y);1;;;;
-Noxious liquid, F, (11?) n.o.s. (ETHYLOL 95, contains Ethyl alcohol)) ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+"Noxious liquid, NF, (5) n.o.s. / Trade Name (Nexbase  3050;3020;3030,3043) / Containscontains Iso- and cyclo-alkanes       ";P;0;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+Noxious liquid, NF(5) n.o.s. LI 220 HF contains White Spirit, low     ;P;0;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Noxious liquid, NF(5) n.o.s.(Solvesso 100, contains Alkyl (C3-C4) benzenes)    ;P;0;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Noxious liquid, NF, (7) n.o.s. (Exxsol D80 , contains iso-and cycloalkanes(C12+));P;0;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+Noxious liquid, NF, (7) n.o.s. ((EXXSOL D60 und auch Nessol D60, contains iso-and cycloalkanes (C10-C11));P;0;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+Noxious liquid, F, (8) n.o.s. (NESSOL D40 contains Iso- and cycloalkanes (C10-C11)) ;P;0;<60°C;2;ja;IBC;;;;;;;;x (Y);1;;;;
+Noxious liquid, F, (11?) n.o.s. (ETHYLOL 95, contains Ethyl alcohol)) ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
 NPK Fertilizer / Ammonium Nitrate Based Fertilizer (Non Hazardous);;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-Nynas VR5000 / Bitumen;;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
+Nynas VR5000 / Bitumen;;;>60°C;1;;MARPOL;;;;;;;;;;x;;;
 NYTRO TAURUS / Insulating Oil;;;;;;MARPOL;;;;;;;;;;x;;;
-Octene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Octene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Odourless Kerosene D70 ;;;;;;MARPOL;;;;;;;;;;x;;;
-Olivines / Mineralgemisch gehört  Mineralklasse der „Silikate und Germanate“ ;;;;;;;;;;;;;;;;;;;Keine Anmeldung
-Olive Stones (crushed)  / Seed Cake / Oil Cake;;;;; ;IMSBC;x;;;B;1;1386;04. Feb;;;;;;
-ORTHO-XYLENE ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Palm fatty acid distillate / PFAD;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Palmkernexpellers / pulverisierte Kernschalen;;;;;;;;;;;;;;;;;;;Keine Anmeldung lt. J.Müller Brake -   siehe aber auch SEED CAKE 
-PALM KERNEL OIL / CPKO / Crude Palm Kernel Oil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-PALM KERNEL STEARIN ;P;0;>60°C;1;Nein;;;;;;;;;;;;;;
-PALM MID-FRACTION       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-PALM OIL          ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-PALM OLEINE       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Palm stearin       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Olivines / Mineralgemisch gehört  Mineralklasse der „Silikate und Germanate“ ;;;;;;;;;;;;;;;;;;;Keine Anmeldung
+Olive Stones (crushed)  / Seed Cake / Oil Cake;;;;; ;IMSBC;x;;;B;1;1386;4.2;;;;;;
+ORTHO-XYLENE ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Palm fatty acid distillate / PFAD;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Palmkernexpellers / pulverisierte Kernschalen;;;;;;;;;;;;;;;;;;;Keine Anmeldung lt. J.Müller Brake -   siehe aber auch SEED CAKE 
+PALM KERNEL OIL / CPKO / Crude Palm Kernel Oil;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+PALM KERNEL STEARIN ;P;0;>60°C;1;Nein;;;;;;;;;;;;;;
+PALM MID-FRACTION       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+PALM OIL          ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+PALM OLEINE       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Palm stearin       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
 Palmitic Acid  ;;;;; ;IBC;;;;;;;;x (Y);1;;;;
-n-Paraffins (C10-C20) / N-ALKANES (C10+);P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Paraffin wax, highly-refined      ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Paraffin wax, semi-refined      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
-PARA XYLENE      ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+n-Paraffins (C10-C20) / N-ALKANES (C10+);P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Paraffin wax, highly-refined      ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Paraffin wax, semi-refined      ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+PARA XYLENE      ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Pea Coke;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-PEAT MOSS / Torf;;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;Für den Kielkanal nicht  anmelden lt. Rücksprache UCA+Herrn Langbein/01.02.2016 => gültig für UCA/S+B
-Peat (milled);;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Herrn Schütte für NOK nicht anmelden/09.02.2021
-Pentadiene / 1,3-Pentadiene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+PEAT MOSS / Torf;;;;; ;IMSBC;x;y;;A/B;2;;;;;;;;Für den Kielkanal nicht  anmelden lt. Rücksprache UCA+Herrn Langbein/01.02.2016 => gültig für UCA/S+B
+Peat (milled);;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Herrn Schütte für NOK nicht anmelden/09.02.2021
+Pentadiene / 1,3-Pentadiene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Perchloroethylene       ;S/P;2;NF;0;Nein;IBC;;;;;;;;x (Y);1;;;;
 PETROLEUM COKE / calcined or uncalcined oder Calcined Coke / Petcoke;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
-PGI / Propylene Glycol Industrial;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
-Phenol;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
+PGI / Propylene Glycol Industrial;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Phenol;S/P;2;>60°C;1;Ja;IBC;;;;;;;;x (Y);1;;;;
 Phosphoric Acid        ;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Z);2;;;;
 PITCH / Pech;;;;; ;IMSBC;x;y;;B;1;;;;;;;;In Bulk/Pitch Verpackt (MSDS = Material Safetey Data Sheet anfordern)
 PME / Biodiesel;;;;; ;IBC;;;;;;;;x (Y);1;;;;
-Polymethylene Polyphenyl Isocyanate       ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
-Polyolefin (molecular weight 300+)       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Polymethylene Polyphenyl Isocyanate       ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Polyolefin (molecular weight 300+)       ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
 Potash / Pottasche;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-Potassium Hydroxide Solution / Caustic Potash / Kaliumhydroxidlösung;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;;
-Propylbenzene / all isomers;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Propylene;;;;; ;IGC;;;;;;1077;02. Feb;;;;x;;
-Propylene Dichloride / 1,2-DICHLOROPROPANE;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;1;;;;
-Propylene Glycol Monoalkyl Ether / DOWANOL PM;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+Potassium Hydroxide Solution / Caustic Potash / Kaliumhydroxidlösung;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;;
+Propylbenzene / all isomers;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Propylene;;;;; ;IGC;;;;;;1077;2.2;;;;x;;
+Propylene Dichloride / 1,2-DICHLOROPROPANE;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Propylene Glycol Monoalkyl Ether / DOWANOL PM;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
 Propylene Oxide; ;; ;; ;IGC;;;;;;1280;3;;;;x;;
-Propylene Oxide;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
-Propylene Tetramer       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
-Propylene Trimer       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Propylene Oxide;S/P;2;<60°C;2;Ja;IBC;;;;;;;;x (Y);1;;;;
+Propylene Tetramer       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
+Propylene Trimer       ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Pyrolysis Fuel Oil;;;;; ;IBC;;;;;;;;?;;?;;;
-Pyrolysis Gasoline containing benzene / Pygas /Aromatic hydrocarbons / C6-8 / Naphtha-Raffinate Pyrolyzate-derived ;S/P;2;<60°C;2;Nein;IBC;;;;;;;; x (Y) ;1;;;;
+Pyrolysis Gasoline containing benzene / Pygas /Aromatic hydrocarbons / C6-8 / Naphtha-Raffinate Pyrolyzate-derived ;S/P;2;<60°C;2;Nein;IBC;;;;;;;; x (Y) ;;;;;
 Pyrite;;;;;;;;;;;;;;;;;;;"Achtung! Kann ""IMSBC: Gruppe C"" (also nicht anmeldepflichig sein) oder auch ""Gruppe: A"" bzw. ""Gruppe: A/B"" (somit Anmeldepflichtig)- beim Kunden nachfragen und ""Shippers declaration for solid bulk cargos"" oder es nennt sich auch ""Cargo information for solid bulk cargos"" anfordern"
-Quicklime / Kalk ungelöscht / Lime / Burnt Lime / Un-slaked Lime / Building Lime / Calcia / Fat Lime / Chemical Lime / Fluxing Lime / Hard Burnt Lime / Soft Burnt Lime / Pebble Lime / Calcium Oxide / Calcium Monoxide / Calcined Limestone / Calcium oxide / CaO;;;;;;IMSBC;x;Y;;B;1;;;;;;;;
-Rapeseed oil / Rapsöl;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Rape seed oil fatty acid methyl esters       ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-BALED RDF;;;;;;IMSBC;x;y;;B;1;;;;;;;;beim KD/Schiff nach Blatt „Shipper's Declaration for Solid Bulk Cargos“ oder „Cargo Information for solid bulk cargos“„ fragen - 13.12.2021
-Refinery NexTAME / Noxious liquid, F, (4) n.o.s. (trade name ...., contains ....);P;0;<60°C;2;Ja;IBC;;;;;;;;x (y);1;;;;
+Quicklime / Kalk ungelöscht / Lime / Burnt Lime / Un-slaked Lime / Building Lime / Calcia / Fat Lime / Chemical Lime / Fluxing Lime / Hard Burnt Lime / Soft Burnt Lime / Pebble Lime / Calcium Oxide / Calcium Monoxide / Calcined Limestone / Calcium oxide / CaO;;;;;;IMSBC;x;Y;;B;1;;;;;;;;
+Rapeseed oil / Rapsöl;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Rape seed oil fatty acid methyl esters       ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+BALED RDF;;;;;;IMSBC;x;y;;B;1;;;;;;;;beim KD/Schiff nach Blatt „Shipper's Declaration for Solid Bulk Cargos“ oder „Cargo Information for solid bulk cargos“„ fragen - 13.12.2021
+Refinery NexTAME / Noxious liquid, F, (4) n.o.s. (trade name ...., contains ....);P;0;<60°C;2;Ja;IBC;;;;;;;;x (y);1;;;;
 Reformate / Naphtha / Gas Oil / UMS / Unleaded mo gas / Motor Gas;;;;;;MARPOL;;;;;;;;;;x;;;
 RDF pellets / Refuse Derived Fuel;;;;; ;;;;;;;;;;;;;;Keine Anmeldung
-Resin Oil / Distilled      ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-RME 0,4MG/11 / FAME;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Sawn Timber / Schnittholz / Sägeholz;;;;; ;IMSBC;x;;;;;;;;;;;;nur wenn als Bulk (also keine Verpackung jeglicher Art (Drahtseile, Kunststoffbänder)  und unter Deck
-SEED Cake mit einem Ölgehalt von höchstens 1,5% und einem Feuchtigkeitsgehalt von höchstens 11% ///with not more than 1.5% oil and not more than 11% moisture.;;;;;;IMSBC;x;;;B;1;2217;04. Feb;;;;;;
-SEED Cake containing vegetable oil a) durch mechanisches Pressen gewonnene Ölsaatenrückstände, die mehr als 10% Öl oder mehr als 20% Öl und Feuchtigkeit zusammen enthalten / (a) mechanically expelled seeds, containing more than 10% of oil or more than 20% of oil and moisture combined.);;;;;;IMSBC;x;;;B;1;1386;04. Feb;;;;;;
+Resin Oil / Distilled      ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+RME 0,4MG/11 / FAME;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Sawn Timber / Schnittholz / Sägeholz;;;;; ;IMSBC;x;;;;;;;;;;;;nur wenn als Bulk (also keine Verpackung jeglicher Art (Drahtseile, Kunststoffbänder)  und unter Deck
+SEED Cake mit einem Ölgehalt von höchstens 1,5% und einem Feuchtigkeitsgehalt von höchstens 11% ///with not more than 1.5% oil and not more than 11% moisture.;;;;;;IMSBC;x;;;B;1;2217;4.2;;;;;;
+SEED Cake containing vegetable oil a) durch mechanisches Pressen gewonnene Ölsaatenrückstände, die mehr als 10% Öl oder mehr als 20% Öl und Feuchtigkeit zusammen enthalten / (a) mechanically expelled seeds, containing more than 10% of oil or more than 20% of oil and moisture combined.);;;;;;IMSBC;x;;;B;1;1386;4.2;;;;;;
 Shale Oil;;;;; ;MARPOL;;;;;;;;;;x;;;
-Slack Wax / Petroleum / Hydrocarbon Wax;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Slack Wax / Petroleum / Hydrocarbon Wax;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Slop Water;;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Johann/16.12.12
 Slops;;;;; ;;;;;;;;;;;;;;
 Slurry / Residues / Petroleum;;;;; ;MARPOL;;;;;;;;;;x ;;;
-Small Arms = Waffen zur Schiffsausrüstung gehörig;;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Aussage von Fr. Kauschmann/16.05.2013 (09:50 Uhr)
+Small Arms = Waffen zur Schiffsausrüstung gehörig;;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Aussage von Fr. Kauschmann/16.05.2013 (09:50 Uhr)
 Solvent  ;;;;;;;;;;;;;;;;;;;Sicherheitsdatenblatt anfordern!!!
-Sodium hydroxide solution / Caustic soda / Natronlauge;S/P;2;NF;0;Ja;IBC;;;;;;;;x  (Y);1;;;;
+Sodium hydroxide solution / Caustic soda / Natronlauge;S/P;2;NF;0;Ja;IBC;;;;;;;;x  (Y);;;;;
 Sodium Sulphate in Bulk;;;;; ;;;;;;;;;;;;;;Keine Anmeldung lt. Aussage von Herrn Illing Gefahrgutauskunfststelle Hamburg/14.02.14-10.25 Uhr
-Soyabean meal / SBM / Sojabohnenmehl;;;;; ;IMSBC;x;y;;;;;;;;;;;"Kann Cat. A, B oder C sein (abhängig von der Zusammensetzung), 
+Soyabean meal / SBM / Sojabohnenmehl;;;;; ;IMSBC;x;y;;;;;;;;;;;"Kann Cat. A, B oder C sein (abhängig von der Zusammensetzung), 
 wenn keine genaue Angabe => Anfragen, ob anmledepflichtig oder nicht,
 Wenn Port of Loading = Brake oder Hamburg => Cat. C und damit nicht anmeldepflichtig"
-Soyabean Oil      ,;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Soyabean Oil      ,;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
 Soja protein concentrat / SPC;;;;;;;;;;;;;;;;;;;Keine Anmeldung
-Steel Turnings;;;;; ;IMSBC;x;;;B;1;2793;04. Feb;;;;;;
-Styrene Monomer       ,;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Sulphur (molten) ;S;1;>60°C;1;Nein;IMSBC; ;;;;;;;x (Z);2;;;;
+Steel Turnings;;;;; ;IMSBC;x;;;B;1;2793;4.2;;;;;;
+Styrene Monomer       ,;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Sulphur (molten) ;S;1;>60°C;1;Nein;IMSBC; ;;;;;;;x (Z);2;;;;
 Sulphuric Acid;S/P;2;NF;0;Ja;IBC;;;;;;;;x (Y);1;;;;
-Sunflower Husk Pellets in bulk;;;;;;;;;;;;;;;;;;;Keine Anmeldung, Gruppe C - tel Aussage Hr. Meiners (J.Müller)
-Sunflower Seed Oil    ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
-Tall oil fatty acid / TOFA (resin acids less than 20%)   ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Tall oil pitch        ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
-Tallow fatty acid;P;0;>60°C;1;Nein;IMSBC; ;;;;;;;x (Y);1;;;;
-tert-Amyl ethyl ether / TAEE  ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
-tert-Amyl methyl ether / TAME;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
-Toasted meals / geröstete Mehle;;;;; ;IMSBC;x;;;;;;;;;;;;Group: B oder C - beim KD nach Blatt „Shipper's Declaration for Solid Bulk Cargos“ oder „Cargo Information for solid bulk cargos“„ fragen
-Toluene ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Sunflower Husk Pellets in bulk;;;;;;;;;;;;;;;;;;;Keine Anmeldung, Gruppe C - tel Aussage Hr. Meiners (J.Müller)
+Sunflower Seed Oil    ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Tall oil fatty acid / TOFA (resin acids less than 20%)   ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Tall oil pitch        ;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Y);1;;;;
+Tallow fatty acid;P;0;>60°C;1;Nein;IMSBC; ;;;;;;;x (Y);1;;;;
+tert-Amyl ethyl ether / TAEE  ;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Z);2;;;;
+tert-Amyl methyl ether / TAME;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
+Toasted meals / geröstete Mehle;;;;; ;IMSBC;x;;;;;;;;;;;;Group: B oder C - beim KD nach Blatt „Shipper's Declaration for Solid Bulk Cargos“ oder „Cargo Information for solid bulk cargos“„ fragen
+Toluene ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
 Transformer oil / Insulating oil (z.B. NS8);;;;; ;MARPOL;;;;;;;;;;x;;;
-Turpentine (z. B. LI200)       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
+Turpentine (z. B. LI200)       ;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (X);0;;;;
 UMS / Gasoline;;;;;;MARPOL;;;;;;;;;;x;;;
 Nynas Naphthenic / Tyre Oils;;;;; ;MARPOL;;;;;;;;;;x;;;
 Ultra-Low Sulphur Fuel Oil / ULSFO;;;;;;MARPOL;;;;;;;;;;x;;;
 Urea Grain in bulk ;;;;; ;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
 Urea Ammonium Nitrate solution / UAN (containing less than 1% free ammonia) ;S/P;2;NF;0;Nein;IBC;;;;;;;;x (Y);1;;;;
-Urea solution ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Urea solution ;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
 Urea Grain in bulk;;;;;;;;;;;;;;;;;;;Keine Anmeldung, IMSBC Gruppe C
-VGO / Vakuum Gas Öl / Schweres Vakuumgasöl / HVGO;;;<60°C;2; ;MARPOL;;;;;;3082;9;;;x;;;
-Vegetable acid oils;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
-Versene 100 / ETHYLENEDIAMINETETRAACETIC ACID NA4-SALT;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
-Versenex 80 / Diethylenetriaminepentaacetic acid / pentasodium salt solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
-Vinyl Acetate monomer;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;;;;;
+VGO / Vakuum Gas Öl / Schweres Vakuumgasöl / HVGO;;;<60°C;2; ;MARPOL;;;;;;3082;9;;;x;;;
+Vegetable acid oils;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (Y) ;;;;;
+Versene 100 / ETHYLENEDIAMINETETRAACETIC ACID NA4-SALT;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y);1;;;;
+Versenex 80 / Diethylenetriaminepentaacetic acid / pentasodium salt solution;P;0;>60°C;1;Nein;IBC;;;;;;;;x (Z);2;;;;
+Vinyl Acetate monomer;S/P;2;<60°C;2;Nein;IBC;;;;;;;;x (Y) ;;;;;
 VISTAR HS / Distillates Petroleum;;;;;;MARPOL;;;;;;;;;;x;;;
-Wash Oil / Creosote oil / METHYLNAPHTHALENE  acenaphthene fraction;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
+Wash Oil / Creosote oil / METHYLNAPHTHALENE  acenaphthene fraction;S/P;2;>60°C;1;Nein;IBC;;;;;;;;x (X);0;;;;
 Washed Waelz Oxide / Zink / zinkhaltiger Staub;;;;;;IMSBC;x;;;A;0;;;;;;;;lt. Rhenus Midgard/Hr. Janssen
-Wilfarin PA1698 RSPO (siehe Fatty acids, (C16+) );P;0;>60°C;1;Nein;;;;;;;;;;;;;;
+Wilfarin PA1698 RSPO (siehe Fatty acids, (C16+) );P;0;>60°C;1;Nein;;;;;;;;;;;;;;
 WOOD PELLETS ;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
-Wood pulp;;;;;;;;;;;;;;;;;;;nicht anmelden = Aussage J.Müller, kein DG
+Wood pulp;;;;;;;;;;;;;;;;;;;nicht anmelden = Aussage J.Müller, kein DG
 Wood pulp pellets ;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
 WOODCHIPS ;;;;; ;IMSBC;x;y;;B;1;;;;;;;;
-Wooden poles / Holzstämme;;;;; ;IMSBC;x;y;;B;1;;;;;;;;NUR UNTER DECK (in Luken) anzumeldem - DECKSLADUNG NICHT! (außer für Baltic Lloyd, Rostock - ALLES anmelden!) lt. Herrn Ronneberger
-Xylenes / Ortho-Xylene / Para Xylene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1; ;;;
+Wooden poles / Holzstämme;;;;; ;IMSBC;x;y;;B;1;;;;;;;;NUR UNTER DECK (in Luken) anzumeldem - DECKSLADUNG NICHT! (außer für Baltic Lloyd, Rostock - ALLES anmelden!) lt. Herrn Ronneberger
+Xylenes / Ortho-Xylene / Para Xylene;P;0;<60°C;2;Nein;IBC;;;;;;;;x (Y);1; ;;;
 Zellulose / Cellulose / Wood pulp;;;;; ;;;;;;;;;;;;;;"Keine Anmeldung,
 Nur falls Bulk-Ladung"
 Zinc Concentrates / MRM BULK CONCENTRATES /  Mineral Concentrates;;;;; ;IMSBC;x;;;A;0;3077;9;;;;;;"Nachfragen ob als Mineral Concentrates (3077/9) oder METAL SULPHIDE CONCENTRATES (MHB) (""Shippers declaration for solid bulk cargos"" anfordern oder auch  ""Cargo information for solid bulk cargos"""
diff --git a/misc/GEFAHRGUTLISTE.xlsx b/misc/GEFAHRGUTLISTE.xlsx
index 7bbdb6f7..109dedd0 100644
Binary files a/misc/GEFAHRGUTLISTE.xlsx and b/misc/GEFAHRGUTLISTE.xlsx differ
diff --git a/misc/db.sqlite b/misc/db.sqlite
index 2f391771..2b477aca 100644
Binary files a/misc/db.sqlite and b/misc/db.sqlite differ
diff --git a/misc/info_gefahrgutliste.txt b/misc/info_gefahrgutliste.txt
index ac627e16..207f62ec 100644
--- a/misc/info_gefahrgutliste.txt
+++ b/misc/info_gefahrgutliste.txt
@@ -4,8 +4,10 @@ ____
 
 Wird verwendet in Dangerous Goods, wenn der Button NewDGItem gedrückt Wird.
 
-1) bei geliefertem Excel unnötige Spalten entfernen
-1.5) Ggf. fehlende Werte in den XY_ENUM Spalten ergänzen 
-2) als CSV speichern
-3) beim Import in DB Browser für SQLite ("Import CSV into Table") darauf achten, dass UTF-8 ausgewählt ist
-4) Im DB Browser die relevanten Spalten von TEXT auf NUMERIC stellen
+1) bei geliefertem Excel unnötige Spalten entfernen (z.B. doppelte Spalte "FP")
+2) Ggf. fehlende Werte in den XY_ENUM Spalten ergänzen 
+3) als CSV speichern
+4) beim Import in DB Browser für SQLite ("Import CSV into Table") darauf achten, dass UTF-8 ausgewählt ist
+5) Im DB Browser die relevanten Spalten von TEXT auf NUMERIC stellen
+
+(wahrscheinlich braucht man 1+2 nicht, Spalten können versteckt sein)
\ No newline at end of file