diff --git a/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs b/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
index 7b188990..a3ae785c 100644
--- a/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
@@ -330,17 +330,10 @@ namespace ENI2.DetailViewControls
             int totalCount = haz.MARPOLPositions.Count + haz.IMDGPositions.Count + haz.IGCPositions.Count + haz.IBCPositions.Count + haz.IMSBCPositions.Count;
             if(totalCount == 1)
             {
-                if (!this.IsDeparture)
-                {
-                    if (!(this.checkBoxDangerousGoodsOnBoard.IsChecked ?? false)) this.checkBoxDangerousGoodsOnBoard.IsChecked = true;
-                    if (this.checkBoxMoUBaltic.IsChecked ?? true) this.checkBoxMoUBaltic.IsChecked = false;
-                }
-                else
-                {
-                    haz.NoDPGOnBoardOnArrival = false;
-                    // theHAZ.DPGManifestOnBoardOnArrival = true;
-                    haz.MOUBaltic = false;
-                }
+                if (!(this.checkBoxDangerousGoodsOnBoard.IsChecked ?? false)) this.checkBoxDangerousGoodsOnBoard.IsChecked = true;
+                if (this.checkBoxMoUBaltic.IsChecked ?? true) this.checkBoxMoUBaltic.IsChecked = false;
+                haz.NoDPGOnBoardOnArrival = false;
+                haz.MOUBaltic = false;
             }
         }
 
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index e6e53e21..0e30232a 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -719,8 +719,8 @@ namespace ENI2.Excel
                 imdgPosition.GrossQuantity_KGM = reader.ReadNumber(imdg_grossQuantity);
                 imdgPosition.VehicleLicenseNumber = reader.ReadText(imdg_number);                
                 imdgPosition.StowagePosition = reader.ReadText(imdg_stowagePosition);                
-                imdgPosition.PortOfLoading = reader.ReadText(imdg_portOfLoading);                
-                imdgPosition.PortOfDischarge = reader.ReadText(imdg_portOfDischarge);                
+                imdgPosition.PortOfLoading = reader.ReadLoCode(imdg_portOfLoading);                
+                imdgPosition.PortOfDischarge = reader.ReadLoCode(imdg_portOfDischarge);                
                 imdgPosition.ContainerNumber = reader.ReadText(imdg_containerNumber);
                 imdgPosition.Remarks = reader.ReadText(imdg_remarks);
             }
@@ -781,8 +781,8 @@ namespace ENI2.Excel
 
                 ibcPosition.Quantity_KGM = (int?)reader.ReadNumber(ibc_quantity);
                 ibcPosition.StowagePosition = reader.ReadText(ibc_stowagePosition);                
-                ibcPosition.PortOfLoading = reader.ReadText(ibc_portOfLoading);                
-                ibcPosition.PortOfDischarge = reader.ReadText(ibc_portOfDischarge);
+                ibcPosition.PortOfLoading = reader.ReadLoCode(ibc_portOfLoading);                
+                ibcPosition.PortOfDischarge = reader.ReadLoCode(ibc_portOfDischarge);
                 ibcPosition.Hazards = reader.ReadHazards(ibc_hazards);
                 ibcPosition.SpecRef15_19 = reader.ReadBoolean(ibc_specref);
                 ibcPosition.Remarks = reader.ReadText(ibc_remarks);
@@ -819,8 +819,8 @@ namespace ENI2.Excel
                 igcPosition.ProductName = productName;                
                 igcPosition.Quantity_KGM = reader.ReadNumber(igc_quantity);
                 igcPosition.StowagePosition = reader.ReadText(igc_stowagePosition);                
-                igcPosition.PortOfLoading = reader.ReadText(igc_portOfLoading);                
-                igcPosition.PortOfDischarge = reader.ReadText(igc_portOfDischarge);
+                igcPosition.PortOfLoading = reader.ReadLoCode(igc_portOfLoading);                
+                igcPosition.PortOfDischarge = reader.ReadLoCode(igc_portOfDischarge);
                 igcPosition.UNNumber = reader.ReadText(igc_unnumber);
                 igcPosition.IMOClass = reader.ReadText(igc_imoclass);
                 igcPosition.Remarks = reader.ReadText(igc_remarks);
@@ -860,8 +860,8 @@ namespace ENI2.Excel
                 imsbcPosition.MHB = reader.ReadBoolean(imsbc_mhb);
                 imsbcPosition.Quantity_KGM = reader.ReadNumber(imsbc_quantity);
                 imsbcPosition.StowagePosition = reader.ReadText(imsbc_stowagePosition);                
-                imsbcPosition.PortOfLoading = reader.ReadText(imsbc_portOfLoading);                
-                imsbcPosition.PortOfDischarge = reader.ReadText(imsbc_portOfDischarge);
+                imsbcPosition.PortOfLoading = reader.ReadLoCode(imsbc_portOfLoading);                
+                imsbcPosition.PortOfDischarge = reader.ReadLoCode(imsbc_portOfDischarge);
                 imsbcPosition.IMOHazardClass = reader.ReadHazardClass(imsbc_hazardclass);
                 imsbcPosition.UNNumber = reader.ReadText(imsbc_unnumber);
                 imsbcPosition.IMOClass = reader.ReadText(imsbc_imoclass);
@@ -911,8 +911,8 @@ namespace ENI2.Excel
 
                 marpolPosition.Quantity_KGM = reader.ReadNumber(marpol_quantity);
                 marpolPosition.StowagePosition = reader.ReadText(marpol_stowagePosition);
-                marpolPosition.PortOfLoading = reader.ReadText(marpol_portOfLoading);
-                marpolPosition.PortOfDischarge = reader.ReadText(marpol_portOfDischarge);
+                marpolPosition.PortOfLoading = reader.ReadLoCode(marpol_portOfLoading);
+                marpolPosition.PortOfDischarge = reader.ReadLoCode(marpol_portOfDischarge);
                 marpolPosition.Remarks = reader.ReadText(marpol_remarks);
             }
 
@@ -959,7 +959,7 @@ namespace ENI2.Excel
         #region STAT
 
         private static bool ScanSTAT(Message statMessage, MessageCore messageCore, List<Message> messages, ExcelReader reader)
-        {            
+        {
             if(statMessage.Elements.Count == 0)
             {
                 STAT newSTAT = new STAT();
@@ -982,22 +982,11 @@ namespace ENI2.Excel
                 }
             }
 
-            stat.PortOfRegistry = reader.ReadLoCode("STAT.PortOfRegistry", false);
-            if (stat.PortOfRegistry.Length == 5)
-            {
-                stat.Flag = stat.PortOfRegistry.Substring(0, 2);
-            } 
-            else
-            {
-                string statFlagString = reader.ReadText("STAT.PortOfRegistry")?.ToUpper();
-                if (statFlagString.Length >= 2)
-                    stat.Flag = statFlagString.Substring(0, 2);
-            }
-            stat.MMSINumber = reader.ReadTextNoWhitespace("STAT.MMSINumber");                        
-            stat.CallSign = reader.ReadTextNoWhitespace("STAT.CallSign");            
-            stat.ISMCompanyId = reader.ReadTextNoWhitespace("STAT.ISMCompanyId");            
+            stat.MMSINumber = reader.ReadTextNoWhitespace("STAT.MMSINumber");
+            stat.CallSign = reader.ReadTextNoWhitespace("STAT.CallSign");
+            stat.ISMCompanyId = reader.ReadTextNoWhitespace("STAT.ISMCompanyId");
 
-            if (!stat.ISMCompanyId.IsNullOrEmpty())                 
+            if (!stat.ISMCompanyId.IsNullOrEmpty())
             {
                 // strip "ISM" at the beginning if it is there (27.12.21)
                 if (stat.ISMCompanyId.StartsWith("imo", StringComparison.OrdinalIgnoreCase))
@@ -1017,12 +1006,12 @@ namespace ENI2.Excel
 
                 if (transportMode.Contains("inland", StringComparison.OrdinalIgnoreCase)) stat.TransportMode = "8";
                 if (transportMode.Equals("8")) stat.TransportMode = transportMode;
-            }                        
+            }
 
             // Vessel Email as HerbergEmail sichern
             messageCore.HerbergEmailContactReportingVessel = reader.ReadText("ShipMail");
 
-            return true;            
+            return true;
         }
 
         #endregion