diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
index 9bdeb82c..9242543d 100644
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
@@ -57,7 +57,7 @@ namespace ENI2.EditControls
             isComplete &= imo_OR_eni;
 
             string locode = this.locodePoC.LocodeValue;
-            bool validLocode = (locode?.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK"));
+            bool validLocode = (locode?.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK") || locode.Equals("DEWHV"));
 
             isComplete &= validLocode;
 
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index 1f72f918..c1a8289b 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -133,7 +133,7 @@ namespace ENI2.EditControls
             isComplete &= imo_OR_eni;
 
             string locode = this.locodePoC.LocodeValue;
-            bool validLocode = (locode != null) && (locode.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK"));
+            bool validLocode = (locode != null) && (locode.Length == 5) && (locode.StartsWith("DE") || locode.StartsWith("DK") || locode.Equals("ZZNOK") || locode.Equals("DEWHV"));
 
             isComplete &= validLocode;
 
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 4eb0c169..eead0e8b 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -1897,9 +1897,7 @@ namespace ENI2.Excel
                 string tDraft = string.Format("TOWD.TowageOnDepartureDraught_DMT_{0}", i);
                 string tLen = string.Format("TOWD.TowageOnDepartureLengthOverall_MTR_{0}", i);
                 string tBeam = string.Format("TOWD.TowageOnDepartureBeam_MTR_{0}", i);
-                string tOp = string.Format("TOWD.TowageOnDepartureOperatorCompanyName_{0}", i);
-                string tPoc = string.Format("TOWD.TowageOnArrivalPurposeOfCall_{0}", i);
-                string tgt = string.Format("TOWD.TowageOnArrivalGrossTonnage_{0}", i);
+                string tOp = string.Format("TOWD.TowageOnDepartureOperatorCompanyName_{0}", i);                
 
                 string towageName = reader.ReadText(tName);
                 if (towageName.IsNullOrEmpty()) continue;
diff --git a/misc/db.sqlite b/misc/db.sqlite
index 34e237b9..2933573c 100644
Binary files a/misc/db.sqlite and b/misc/db.sqlite differ