diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI2/DetailViewControls/OverViewDetailControl.xaml
index a5489f27..9817e9bf 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -75,7 +75,7 @@
                 <Label HorizontalAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textTicketNo}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="3" Content="{x:Static p:Resources.textCreated}" Margin="0,0,10,0" />
                 <Label Name="labelCreated" Grid.Column="4" Grid.Row="4" Margin="2, 0, 0, 0" />
-                    <Button Name="buttonFormblattNeu" Grid.Column="5" Grid.Row="4" Margin="2" Click="buttonFormblattNeu_Click" >
+                    <Button Name="buttonFormblattNeu" Grid.Column="5" Grid.Row="7" Margin="2" Click="buttonFormblattNeu_Click" >
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="Formblatt neu"></TextBlock>
                             <Image Source="../Resources/excel.png" Margin="10,0,5,0" Height="16"/>
@@ -129,7 +129,7 @@
                     </StackPanel>
                 </Button>
 
-                <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="7" Visibility="Hidden" Name="stackPanelLock">
+                <StackPanel Orientation="Horizontal" Grid.Column="5" Grid.Row="4" Visibility="Hidden" Name="stackPanelLock">
                     <Image Source="../Resources/lock.png" Margin="0,0,5,0" Height="24" />
                     <TextBlock Name="textBlockLockUserName" VerticalAlignment="Center" />
                 </StackPanel>
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
index dbcd11dd..d622f76d 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs
@@ -774,7 +774,7 @@ namespace ENI2.DetailViewControls
         /// </summary>        
         private void buttonFormblattNeu_Click(object sender, RoutedEventArgs e)
         {
-            string filename = string.Format("{0}_{1}_EU-NoAD-Data-Collecting-Tool-5_0.xlsx", this.Core.Shipname, this.Core.DisplayId);
+            string filename = string.Format("{0}_EU-NoAD-Data-Collecting-Tool-5_0.xlsx", this.Core.Shipname);
             this.ExportData(filename, false);
         }
 
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 43009026..97258620 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>13</ApplicationRevision>
-    <ApplicationVersion>7.0.0.13</ApplicationVersion>
+    <ApplicationRevision>14</ApplicationRevision>
+    <ApplicationVersion>7.0.0.14</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index 31c2afaf..402d79cd 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -114,8 +114,11 @@ namespace ENI2.Excel
                 {
                     result = 2;
                 }
-                else if (val.Equals("n", StringComparison.CurrentCultureIgnoreCase) || val.Equals("not applicable", StringComparison.CurrentCultureIgnoreCase) ||
-                    val.Equals("d", StringComparison.CurrentCultureIgnoreCase) || val.Equals("diverse", StringComparison.CurrentCultureIgnoreCase))
+                else if (val.Equals("n", StringComparison.CurrentCultureIgnoreCase) || 
+                         val.Equals("not applicable", StringComparison.CurrentCultureIgnoreCase) || 
+                         val.Equals("not_applicable", StringComparison.CurrentCultureIgnoreCase) || 
+                         val.Equals("d", StringComparison.CurrentCultureIgnoreCase) || 
+                         val.Equals("diverse", StringComparison.CurrentCultureIgnoreCase))
                 {
                     result = 9;
                 }
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index c7206f2f..b72ed1b9 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -1171,8 +1171,20 @@ namespace ENI2.Excel
                     was.Waste.Add(waste);
                 }
 
-                waste.WasteType = (int?) reader.ReadNumber(wasteCode);                
-                
+                waste.WasteType = (int?) reader.ReadNumber(wasteCode);
+                // falls ein altes Sheet eingelesen wird, diese Felder automatisch mappen
+                if (waste.WasteType == 1100) waste.WasteType = 102;
+                if (waste.WasteType == 1200) waste.WasteType = 101;
+                if (waste.WasteType == 1300) waste.WasteType = 999;
+                if (waste.WasteType == 2100) waste.WasteType = 502;
+                if (waste.WasteType == 2200) waste.WasteType = 501;
+                if (waste.WasteType == 2300) waste.WasteType = 503;
+                if (waste.WasteType == 2311) waste.WasteType = 504;
+                if (waste.WasteType == 2308) waste.WasteType = 505;
+                if (waste.WasteType == 2313) waste.WasteType = 506;
+                if (waste.WasteType == 2309) waste.WasteType = 507;
+                if (waste.WasteType == 3000) waste.WasteType = 401;
+                if (waste.WasteType == 2600) waste.WasteType = 506;
 
                 // Waste description Spezialfälle für DK                
                 waste.WasteDescription = reader.ReadText(wasteDescription);
@@ -1204,25 +1216,25 @@ namespace ENI2.Excel
                 if((reader.Mode == ExcelReader.CountryMode.DK) && (i==9))
                 {
                     _log.DebugFormat("DK: Changing Waste code {0} to 2300 for line {1}", waste.WasteType, i);
-                    waste.WasteType = 2300;                    
+                    waste.WasteType = 2300;
                 }
                 
-                waste.WasteDisposalAmount_MTQ = reader.ReadNumberDefaultZero(wasteAmount);				
-                waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity);				
+                waste.WasteDisposalAmount_MTQ = reader.ReadNumberDefaultZero(wasteAmount);
+                waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity);
                 waste.WasteAmountRetained_MTQ = reader.ReadNumberDefaultZero(wasteRetained);
                 
                 waste.WasteDisposalPort = reader.ReadLoCode(wastePort);   // aka RemainingWasteDisposalPort              
                 
                 if (waste.WasteDisposalPort.IsNullOrEmpty())
                 {
-                    waste.WasteDisposalPort = "ZZUKN";                
-                }                
+                    waste.WasteDisposalPort = "ZZUKN";
+                }
 
-                waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);				                                
+                waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);
 
                 if (!waste.WasteType.HasValue)
                 {
-                    was.Waste.Remove(waste);                    
+                    was.Waste.Remove(waste);
                 }
             }
 
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 7c855edd..995f0718 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -156,15 +156,17 @@ namespace ENI2.Excel
                         case Message.NotificationClass.TIEFA:                            
                             if (message.Elements[0] is TIEFA tiefa)
                             {
+                                // Ref-Sheet: dm, neues Formblatt: m
                                 if (tiefa.DraughtUponArrival_DMT.HasValue)
-                                    WriteNumber("TIEFA.DraughtUponArrival_DMT", tiefa.DraughtUponArrival_DMT.Value / 10.0);
+                                    WriteNumber("TIEFA.DraughtUponArrival_DMT", tiefa.DraughtUponArrival_DMT.Value / (isRefSheet ? 1 : 10.0));
                             }
                             break;
                         case Message.NotificationClass.TIEFD:
                             if (message.Elements[0] is TIEFD tiefd)
                             {
+                                // Ref-Sheet: dm, neues Formblatt: m
                                 if (tiefd.DraughtUponDeparture_DMT.HasValue)
-                                    WriteNumber("TIEFD.DraughtUponDeparture_DMT", tiefd.DraughtUponDeparture_DMT.Value / 10.0);
+                                    WriteNumber("TIEFD.DraughtUponDeparture_DMT", tiefd.DraughtUponDeparture_DMT.Value / (isRefSheet ? 1 : 10.0));
                             }
                             break;
                         case Message.NotificationClass.TOWA:
@@ -192,7 +194,7 @@ namespace ENI2.Excel
                 }
             }
 
-            WriteCore(core);
+            WriteCore(core, isRefSheet);
 
         }        
 
@@ -267,10 +269,10 @@ namespace ENI2.Excel
             }
         }
 
-        private void WriteCore(MessageCore core)
+        private void WriteCore(MessageCore core, bool isRefSheet)
         {
             WriteText("ID", core.IsTransit ? core.TransitId : core.VisitId);
-            WriteText("Visit.PortOfCall", core.PoC);
+            WriteText("Visit.PortOfCall", isRefSheet ? core.PoC : Locode.LocodeDB.LocationNameFromLocode(core.PoC));
             WriteText("Visit.IMONumber", core.IMO);
             WriteText("ReferenceNumber", core.HerbergReportType);
             WriteText("ShipMail", core.HerbergEmailContactReportingVessel);
@@ -312,7 +314,7 @@ namespace ENI2.Excel
                 else
                 {
                     if (ReportDocument.cargoCodesNST.TryGetValue(ladg.CargoCodeNST, out string cargoCode))
-                        WriteText(lnType, cargoCode);
+                        WriteText(lnType, cargoCode.Substring(3)); // description w/o code 
                 }
                 WriteText(lnZusatz, ladg.CargoCodeNST_3);
                 WriteNumber(lnCNOI, ladg.CargoNumberOfItems);
@@ -412,7 +414,10 @@ namespace ENI2.Excel
 
                 WriteText(crewLastName, crew.CrewMemberLastName);
                 WriteText(crewFirstName, crew.CrewMemberFirstName);
-                WriteGender(crewGender, crew.CrewMemberGender);
+                if (isRefSheet)
+                    WriteGenderCode(crewGender, crew.CrewMemberGender);
+                else
+                    WriteGenderFull(crewGender, crew.CrewMemberGender);
                 WriteText(crewNationality, crew.CrewMemberNationality);
                 WriteText(crewDuty, crew.CrewMemberDuty);
                 WriteText(crewPlaceOfBirth, crew.CrewMemberPlaceOfBirth);
@@ -820,7 +825,10 @@ namespace ENI2.Excel
 
                 WriteText(pasLastName, pas.PassengerLastName);
                 WriteText(pasFirstName, pas.PassengerFirstName);
-                WriteGender(pasGender, pas.PassengerGender);
+                if (isRefSheet)
+                    WriteGenderCode(pasGender, pas.PassengerGender);
+                else
+                    WriteGenderFull(pasGender, pas.PassengerGender);
                 WriteText(pasNationality, pas.PassengerNationality);
                 WriteText(pasEmbarkation, pas.PassengerPortOfEmbarkation);
                 WriteText(pasDebarkation, pas.PassengerPortOfDisembarkation);
@@ -1104,9 +1112,9 @@ namespace ENI2.Excel
                 }
             }
 
-            WriteText("WAS.LastWasteDisposalPort", was.LastWasteDisposalPort);
+            WriteText("WAS.LastWasteDisposalPort", isRefSheet ? was.LastWasteDisposalPort : Locode.LocodeDB.LocationNameFromLocode(was.LastWasteDisposalPort));
             WriteText("WAS.WasteDisposalServiceProviderName", was.WasteDisposalServiceProviderText);
-            WriteText("WAS.NextWasteDisposalPort", was.NextWasteDisposalPort);
+            WriteText("WAS.NextWasteDisposalPort", isRefSheet? was.NextWasteDisposalPort : Locode.LocodeDB.LocationNameFromLocode(was.NextWasteDisposalPort));
             WriteBoolean("WAS.ConfirmationOfCorrectness", true);
             WriteBoolean("WAS.ConfirmationOfSufficiency", true);
 
@@ -1240,7 +1248,7 @@ namespace ENI2.Excel
                 else
                 {
                     if (LocalizedLookup.getVesselTypes().TryGetValue(stat.ShipType, out string shipType))
-                        WriteText("STAT.ShipType", shipType);
+                        WriteText("STAT.ShipType", shipType.Substring(3));
                 }
             }
         }
@@ -1280,7 +1288,7 @@ namespace ENI2.Excel
 
         #region write simple things
 
-        private void WriteGender(string label, byte? gender)
+        private void WriteGenderCode(string label, byte? gender)
         {
             if(gender.HasValue)
             {
@@ -1291,6 +1299,17 @@ namespace ENI2.Excel
             }
         }
 
+        private void WriteGenderFull(string label, byte? gender)
+        {
+            if (gender.HasValue)
+            {
+                if (gender == 0) WriteText(label, "not known");
+                if (gender == 1) WriteText(label, "male");
+                if (gender == 2) WriteText(label, "female");
+                if (gender == 9) WriteText(label, "not applicable");
+            }
+        }
+
         #endregion
 
         #region write value types
diff --git a/ENI2/Util/GlobalStructures.cs b/ENI2/Util/GlobalStructures.cs
index 6f2b6e82..ffb73d24 100644
--- a/ENI2/Util/GlobalStructures.cs
+++ b/ENI2/Util/GlobalStructures.cs
@@ -175,8 +175,11 @@ namespace ENI2.Util
                 {
                     result = 2;
                 }
-                else if (val.Equals("d", StringComparison.CurrentCultureIgnoreCase) || val.Equals("diverse", StringComparison.CurrentCultureIgnoreCase) ||
-                    val.Equals("n", StringComparison.CurrentCultureIgnoreCase) || val.Equals("not applicable", StringComparison.CurrentCultureIgnoreCase))
+                else if (val.Equals("d", StringComparison.CurrentCultureIgnoreCase) || 
+                    val.Equals("diverse", StringComparison.CurrentCultureIgnoreCase) ||
+                    val.Equals("n", StringComparison.CurrentCultureIgnoreCase) || 
+                    val.Equals("not_applicable", StringComparison.CurrentCultureIgnoreCase) ||
+                    val.Equals("not applicable", StringComparison.CurrentCultureIgnoreCase))
                 {
                     result = 9;
                 }
diff --git a/misc/EU-NoAD-Data-Collecting-Tool-5_0.xlsx b/misc/EU-NoAD-Data-Collecting-Tool-5_0.xlsx
index 1e4d116f..e04528f8 100644
Binary files a/misc/EU-NoAD-Data-Collecting-Tool-5_0.xlsx and b/misc/EU-NoAD-Data-Collecting-Tool-5_0.xlsx differ