diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index ce6c664b..4fe915b1 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -372,6 +372,14 @@ namespace ENI2
                     message.SaveElements();
                 }
                 message.IsDirty = false;
+
+                if(message.MessageNotificationClass == Message.NotificationClass.ATA)
+                {
+                    DetailBaseControl currentControl = this.detailView.Children[0] as DetailBaseControl;                    
+                    // ggf. hat sich die Ticketnr geändert..
+                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core);                    
+                }
+
             }
         }
 
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
index e350683b..bb022dd7 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml
@@ -21,20 +21,22 @@
                 <ColumnDefinition Width="2*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
+                <RowDefinition Height="28" />
                 <RowDefinition Height="28" />
                 <RowDefinition Height="28" />
                 <RowDefinition Height="10" />
-                <RowDefinition Height="400" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <Label Content="{x:Static p:Resources.textDangerousGoodsOnBoard}" Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival, Converter={util:InverseBooleanConverter}}" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"/>
-            <CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center"/>
-            <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center"/>
-            <ComboBox x:Name="comboBoxVesselClass" Grid.Row="1" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
-            <TabControl Name="tabControlPositions" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="5">
+            <TextBlock Name="textBlockMessageClass" FontWeight="DemiBold" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <Label Content="{x:Static p:Resources.textDangerousGoodsOnBoard}" Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+            <Label Content="{x:Static p:Resources.textVesselClass}" Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+            <Label Content="{x:Static p:Resources.textDGManifestOnBoard}" Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+            <Label Content="{x:Static p:Resources.textMoUBalticRoRo}" Grid.Column="2" Grid.Row="2" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+            <CheckBox Name="checkBoxDangerousGoodsOnBoard" IsChecked="{Binding NoDPGOnBoardOnArrival, Converter={util:InverseBooleanConverter}}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+            <CheckBox Name="checkBoxDGManifestOnBoard" IsChecked="{Binding DPGManifestOnBoardOnArrival}" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center"/>
+            <CheckBox Name="checkBoxMoUBaltic" IsChecked="{Binding MOUBaltic}" Grid.Row="2" Grid.Column="3" VerticalAlignment="Center"/>
+            <ComboBox x:Name="comboBoxVesselClass" Grid.Row="2" Grid.Column="1" Margin="2" SelectedIndex="{Binding INFShipClass, Converter={util:ByteConverter}}" ContextMenu="{DynamicResource ClearContextMenu}" IsEditable="True" />
+            <TabControl Name="tabControlPositions" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="5">
                 <TabItem Header="{x:Static p:Resources.textIMDGItems}" Name="tabIMDGItems">
                     <enictrl:ENIDataGrid x:Name="dataGridIMDGItems" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0">
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
index 75c42189..1a267331 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml.cs
@@ -74,6 +74,7 @@ namespace ENI2.DetailViewControls
                         }
                     }
                 }
+                this.textBlockMessageClass.Text = IsDeparture ? "HAZD" : "HAZA";
             }
 
             #region HAZ
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
index 16ff8e6b..3acdb276 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
@@ -48,7 +48,7 @@
             <Label Content="{x:Static p:Resources.textLastExpandedInspection  }" Grid.Column="0" Grid.Row="7" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
             <DatePicker Grid.Column="1" Grid.Row="7" Name="datePickerLastExpandedInspection" VerticalAlignment="Center" SelectedDate="{Binding DateOfLastExpandedInspection, Mode=TwoWay}"  Margin="2,2,2,2" />
             <Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-            <xctk:IntegerUpDown Grid.Row="8" Grid.Column="1" Name="integerUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
+            <xctk:DoubleUpDown Grid.Row="8" Grid.Column="1" Name="doubleUpDownPlannedPeriodOfStay" Value="{Binding PlannedPeriodOfStay_HUR, Mode=TwoWay}" FormatString="N2" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" TextAlignment="Left"/>
         </Grid>
         </ScrollViewer>
     </GroupBox>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
index 1a21bfc0..702f8041 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml.cs
@@ -47,7 +47,7 @@ namespace ENI2.DetailViewControls
             this.RegisterTextboxChange(this.textBoxPlannedOperations, Message.NotificationClass.PRE72H);
             this.RegisterTextboxChange(this.textBoxPlannedWorks, Message.NotificationClass.PRE72H);
             this.RegisterDatePickerChange(this.datePickerLastExpandedInspection, Message.NotificationClass.PRE72H);
-            this.RegisterIntegerUpDownChange(this.integerUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);
+            this.RegisterDoubleUpDownChange(this.doubleUpDownPlannedPeriodOfStay, Message.NotificationClass.PRE72H);
             this.checkBoxTanker.Checked += CheckBoxTanker_Checked;
             this.checkBoxTanker.Unchecked += CheckBoxTanker_Checked;
         }
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index eda3ca71..ab593b42 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -122,6 +122,7 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="UIAutomationProvider" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
index a624eca3..6a3247e0 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
@@ -8,17 +8,17 @@
         xmlns:enictrl="clr-namespace:ENI2.Controls"
         xmlns:p="clr-namespace:ENI2.Properties"
         mc:Ignorable="d"
-        Title="{x:Static p:Resources.textPortCall}" Height="220" Width="450" WindowStyle="SingleBorderWindow" Background="AliceBlue">
+        Title="{x:Static p:Resources.textPortCall}" Height="300" Width="550" WindowStyle="SingleBorderWindow" Background="AliceBlue">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="56" />
+            <RowDefinition Height="136" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" />
-            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textPortCall}" />
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textATDPortOfCall}" />
@@ -27,6 +27,6 @@
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="0" x:Name="locodeControlPortName" />
         <DatePicker Name="datePickerATAPortOfCall" Grid.Column="1" Grid.Row="1" Margin="2"/>
         <CheckBox Name="checkBoxCrewMembersJoined" VerticalContentAlignment="Center" Grid.Column="1" Grid.Row="2" />
-        <TextBox Name="textBoxCrewMemberNames" Grid.Column="1" Grid.Row="3" Margin="2" />
+        <TextBox Name="textBoxCrewMemberNames" Grid.Column="1" Grid.Row="3" Margin="2" TextWrapping="Wrap"/>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml.cs
index 458e5526..67a39f2c 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml.cs
@@ -63,7 +63,8 @@ namespace ENI2.EditControls
             this.ShipToShipActivity.ShipToShipActivityDateFrom = this.datePickerFrom.SelectedDate;
             this.ShipToShipActivity.ShipToShipActivityDateTo = this.datePickerTo.SelectedDate;
             // this.ShipToShipActivity.ShipToShipActivityType = this.textBoxActivityType.Text.Trim();
-            this.ShipToShipActivity.ShipToShipActivityTypeCode = (int) this.comboBoxActivityType.SelectedValue;
+            if(this.comboBoxActivityType.SelectedValue != null)
+                this.ShipToShipActivity.ShipToShipActivityTypeCode = (int) this.comboBoxActivityType.SelectedValue;
             this.ShipToShipActivity.ShipToShipActivitySecurityMattersToReport = this.textBoxSecurityMatters.Text.Trim();
         }
 
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 2b15891f..c4531353 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index e6400229..20f0e24c 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -704,11 +704,13 @@ namespace bsmd.ExcelReadService
             }
             #endregion
 
+            
             if(haza.HasPositions) // Christin 22.3.17: Felder bei Positionen immer fest ausfüllen
             {
                 haza.NoDPGOnBoardOnArrival = false;
-                haza.DPGManifestOnBoardOnArrival = true;
+                // haza.DPGManifestOnBoardOnArrival = true;
             }
+            
 
         }
 
@@ -1042,11 +1044,16 @@ namespace bsmd.ExcelReadService
             }
             #endregion
 
+            
+
             if (hazd.HasPositions) // Christin 22.3.17: Felder bei Positionen immer fest ausfüllen
             {
                 hazd.NoDPGOnBoardOnArrival = false;
-                hazd.DPGManifestOnBoardOnArrival = true;
+            //    hazd.DPGManifestOnBoardOnArrival = true;
             }
+
+            
+
         }
 
         #endregion
diff --git a/nsw/Source/bsmd.database/CREW.cs b/nsw/Source/bsmd.database/CREW.cs
index 58be9353..23a2dc64 100644
--- a/nsw/Source/bsmd.database/CREW.cs
+++ b/nsw/Source/bsmd.database/CREW.cs
@@ -70,7 +70,7 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Nationality")]
-        [Validation(ValidationCode.NOT_NULL)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberNationality { get; set; }
diff --git a/nsw/Source/bsmd.database/PAS.cs b/nsw/Source/bsmd.database/PAS.cs
index 6fa816f9..41e78631 100644
--- a/nsw/Source/bsmd.database/PAS.cs
+++ b/nsw/Source/bsmd.database/PAS.cs
@@ -70,7 +70,7 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Nationality")]
-        [Validation(ValidationCode.NOT_NULL)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
         [ENI2Validation]
         public string PassengerNationality { get; set; }
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 041315ca..11d58cf1 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("5.0.8")]
+[assembly: AssemblyInformationalVersion("5.0.9")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2018 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index f9f7b973..f8e3d142 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("5.0.8.*")]
+[assembly: AssemblyVersion("5.0.9.*")]
 
diff --git a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
index ab67acad..67959bb3 100644
--- a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
+++ b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
@@ -195,6 +195,13 @@ namespace bsmd.database
                     errors.Add(RuleEngine.CreateError(ValidationCode.LOCODE, "ShipToShipActivityLocationLoCode", this.ShipToShipActivityLocationLoCode, this.Title, this.Identifier, this.SEC.Tablename));
             }
 
+            if(this.ShipToShipActivityTypeCode.HasValue)
+            {
+                if ((this.ShipToShipActivityTypeCode.Value < 1) ||
+                    ((this.ShipToShipActivityTypeCode.Value > 23) && (this.ShipToShipActivityTypeCode.Value != 98)))
+                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "ShipToShipActivityType", this.ShipToShipActivityTypeCode.ToString(), this.Title, this.Identifier, this.SEC.Tablename));                    
+            }
+
         }
 
         #endregion
diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs
index bfeac22e..a2f328f9 100644
--- a/nsw/Source/bsmd.dbh/Request.cs
+++ b/nsw/Source/bsmd.dbh/Request.cs
@@ -272,7 +272,8 @@ namespace bsmd.dbh
                                     RootNOA_NODCallPurpose rnncp = new RootNOA_NODCallPurpose();
                                     CallPurpose callPurpose = noa_nod.CallPurposes[i] as CallPurpose;
                                     rnncp.CallPurposeCode = callPurpose.CallPurposeCode;
-                                    rnncp.CallPurposeDescription = callPurpose.CallPurposeDescription;
+                                    if(callPurpose.CallPurposeDescription != string.Empty)
+                                        rnncp.CallPurposeDescription = callPurpose.CallPurposeDescription;
                                     choices.Add(rnncp);
                                 }
                             }                            
@@ -828,7 +829,8 @@ namespace bsmd.dbh
                                 rootPre.TankerDetails.TankerHullConfiguration = (HullConfiguration)pre72h.TankerHullConfiguration.Value;
                             if (pre72h.ConditionCargoBallastTanks.HasValue)
                                 rootPre.TankerDetails.ConditionCargoBallastTanks = (TankCondition)pre72h.ConditionCargoBallastTanks.Value;
-                            rootPre.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
+                            if(pre72h.NatureOfCargo != string.Empty)
+                                rootPre.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
                             rootPre.TankerDetails.VolumeOfCargo_TNESpecified = pre72h.VolumeOfCargo.HasValue;
                             if (pre72h.VolumeOfCargo.HasValue)
                                 rootPre.TankerDetails.VolumeOfCargo_TNE = Decimal.Round((decimal)(pre72h.VolumeOfCargo.Value), 3);
diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs
index d1eab914..064dc8e4 100644
--- a/nsw/Source/bsmd.hisnord/Request.cs
+++ b/nsw/Source/bsmd.hisnord/Request.cs
@@ -271,7 +271,8 @@ namespace bsmd.hisnord
                                         hn_noanod.CallPurposes[i] = new callpurpose();
                                         CallPurpose callPurpose = noa_nod.CallPurposes[i] as CallPurpose;
                                         hn_noanod.CallPurposes[i].CallPurposeCode = callPurpose.CallPurposeCode.ToString();
-                                        hn_noanod.CallPurposes[i].CallPurposeDescription = callPurpose.CallPurposeDescription;
+                                        if(callPurpose.CallPurposeDescription != string.Empty)
+                                            hn_noanod.CallPurposes[i].CallPurposeDescription = callPurpose.CallPurposeDescription;
                                     }
                                 }
 
@@ -789,7 +790,8 @@ namespace bsmd.hisnord
                                     hn_pre72.TankerDetails = new tankerdetails();
                                     if (pre72h.ConditionCargoBallastTanks.HasValue)
                                         hn_pre72.TankerDetails.ConditionCargoBallastTanks = (cargoconditiontype)pre72h.ConditionCargoBallastTanks.Value;
-                                    hn_pre72.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
+                                    if(pre72h.NatureOfCargo != string.Empty)
+                                        hn_pre72.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo;
                                     if (pre72h.TankerHullConfiguration.HasValue)
                                         hn_pre72.TankerDetails.TankerHullConfiguration = (hullconfigtype)pre72h.TankerHullConfiguration.Value;
                                     if (pre72h.VolumeOfCargo.HasValue)