diff --git a/ENI2/EditControls/SelectPortAreaDialog.xaml.cs b/ENI2/EditControls/SelectPortAreaDialog.xaml.cs
index 9f9d85c4..c0ea161f 100644
--- a/ENI2/EditControls/SelectPortAreaDialog.xaml.cs
+++ b/ENI2/EditControls/SelectPortAreaDialog.xaml.cs
@@ -65,7 +65,7 @@ namespace ENI2.EditControls
         private void textBoxSearchDescription_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
         {
             string searchText = this.textBoxSearchDescription.Text.Trim();
-
+            if (_portAreas == null) return;
             lock (filterLock)
             {
                 IEnumerable<PortAreaInfo> filtered = _portAreas;
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml b/ENI2/SheetDisplayControls/PortControl.xaml
index 52f75260..5202b86d 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml
+++ b/ENI2/SheetDisplayControls/PortControl.xaml
@@ -207,6 +207,7 @@
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
+                        <RowDefinition Height="28" />
 
                         <RowDefinition Height="36" />
                         <RowDefinition Height="180" />
@@ -214,18 +215,20 @@
                     </Grid.RowDefinitions>
                     <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text25CargeOnBoard}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textGeneralCargoDescription}" Name="label_GeneralCargoDescription" Margin="0,0,10,0"/>
-                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="1" Grid.Column="1" IsEditable="True" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
+                    <ComboBox Name="comboBoxGeneralDescriptionOfCargo" Grid.Row="1" Grid.Column="1" IsEditable="False" StaysOpenOnEdit="True" SelectedIndex="{Binding GeneralDescriptionOfCargo, Converter={util:ByteConverter}}" Margin="2"  IsTextSearchEnabled="True"/>
                     <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textFumigatedBulkCargo}" Name="label_INFOFumigatedBulkCargo" VerticalContentAlignment="Center" Margin="0,0,10,0"/>
-                    <CheckBox Grid.Row="2" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2"/>
-                    <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="3" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
-                    <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="4"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center" MaxLength="99" />
-                    <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
-                    <xctk:DoubleUpDown Grid.Row="5" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
+                    <CheckBox Grid.Row="2" Grid.Column="1" Name="checkBoxFumigatedBulkCargo" VerticalContentAlignment="Center" IsChecked="{Binding FumigatedBulkCargoBool, Mode=TwoWay}" Margin="2,2,2,2"/>
+                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textTanker}" VerticalContentAlignment="Center" Margin="0,0,10,0" />
+                    <CheckBox Grid.Row="3" Grid.Column="1" Name="checkBoxTanker" VerticalContentAlignment="Center" IsChecked="{Binding Tanker, Mode=TwoWay}" Margin="2,2,2,2" />
+                    <Label Content="{x:Static p:Resources.textTankerCondition}" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxConditionCargoBallastTanks" Margin="2" SelectedIndex="{Binding ConditionCargoBallastTanks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={util:ByteConverter}}" IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}"  ContextMenu="{DynamicResource ClearContextMenu}"/>
+                    <Label Content="{x:Static p:Resources.textTankerNatureOfCargo}" Grid.Column="0" Grid.Row="5" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <TextBox Text="{Binding NatureOfCargo, Mode=TwoWay, Converter={util:TrimStringConverter}}" Name="textBoxNatureOfCargo" Grid.Column="1" Grid.Row="5"  Margin="2,2,2,2"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" VerticalContentAlignment="Center" MaxLength="99" />
+                    <Label Content="{x:Static p:Resources.textTankerVolumeOfCargo}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
+                    <xctk:DoubleUpDown Grid.Row="6" Grid.Column="1" Name="doubleUpDownVolumeOfCargo" ShowButtonSpinner="False" ParsingNumberStyle="Any" Margin="2,2,2,2" FormatString="N3" Value="{Binding VolumeOfCargo, Mode=TwoWay}"  IsEnabled="{Binding ElementName=checkBoxTanker, Path=IsChecked}" TextAlignment="Left"/>
 
-                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text26CargoPort}" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3"/>
-                    <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3">
+                    <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text26CargoPort}" Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3"/>
+                    <GroupBox Name="ladgGroupBox" Header="{x:Static p:Resources.textLadg}" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="3">
                         <enictrl:ENIDataGrid x:Name="dataGridLADG" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
              AutoGenerateColumns="False" Margin="0,5,0,0">
                             <DataGrid.Columns>
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml.cs b/ENI2/SheetDisplayControls/PortControl.xaml.cs
index 87875dfa..c0f16ff3 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PortControl.xaml.cs
@@ -160,6 +160,7 @@ namespace ENI2.SheetDisplayControls
             this.comboBoxConditionCargoBallastTanks.DataContext = this._pre72H;
             this.textBoxNatureOfCargo.DataContext = this._pre72H;
             this.doubleUpDownVolumeOfCargo.DataContext = this._pre72H;
+            this.checkBoxTanker.DataContext = this._pre72H;
 
             // 2.6
             this.dataGridLADG.Initialize();
diff --git a/ENI2/SheetDisplayControls/PreArrivalControl.xaml b/ENI2/SheetDisplayControls/PreArrivalControl.xaml
index b4bec2a2..280f43bc 100644
--- a/ENI2/SheetDisplayControls/PreArrivalControl.xaml
+++ b/ENI2/SheetDisplayControls/PreArrivalControl.xaml
@@ -15,7 +15,7 @@
         <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="220"/>
+                    <ColumnDefinition Width="240"/>
                     <ColumnDefinition Width=".3*" />
                     <ColumnDefinition Width=".3*" />
                 </Grid.ColumnDefinitions>
diff --git a/ENI2/SheetDisplayControls/PreDepartureControl.xaml b/ENI2/SheetDisplayControls/PreDepartureControl.xaml
index 728a6901..ffd3e174 100644
--- a/ENI2/SheetDisplayControls/PreDepartureControl.xaml
+++ b/ENI2/SheetDisplayControls/PreDepartureControl.xaml
@@ -92,22 +92,22 @@
                 <enictrl:ENIDataGrid Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="3" x:Name="dataGridTowageOnDeparture" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" AutoGenerateColumns="False" Margin="0,5,0,0">
                     <DataGrid.Columns>
                         <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding TowageOnArrivalName}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPurposeOfCall}" Binding="{Binding TowageOnArrivalPurposeOfCall}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFlag}" Binding="{Binding TowageOnArrivalFlag}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textDraughtInDecimetre}" Binding="{Binding TowageOnArrivalDraught_DMT, StringFormat={}{0:N1}}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textGrossTonnage}" Binding="{Binding TowageOnArrivalGrossTonnage}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textLengthOverAll}" Binding="{Binding TowageOnArrivalLengthOverall_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textBeamOverAll}" Binding="{Binding TowageOnArrivalBeam_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding TowageOnArrivalRemarks}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCompanyName}" Binding="{Binding TowageOnArrivalOperatorCompanyName}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textStreetNumber}" Binding="{Binding TowageOnArrivalOperatorStreetNameAndNumber}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPostalCode}" Binding="{Binding TowageOnArrivalOperatorPostalCode}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCity}" Binding="{Binding TowageOnArrivalOperatorCity}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCountry}" Binding="{Binding TowageOnArrivalOperatorCountry}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textEMail}" Binding="{Binding TowageOnArrivalOperatorEmail}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textPhone}" Binding="{Binding TowageOnArrivalOperatorPhone}" IsReadOnly="True" Width="Auto" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textFax}" Binding="{Binding TowageOnArrivalOperatorFax}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textName}" Binding="{Binding TowageOnDepartureName}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textPurposeOfCall}" Binding="{Binding TowageOnDeparturePurposeOfCall}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textFlag}" Binding="{Binding TowageOnDepartureFlag}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textDraughtInDecimetre}" Binding="{Binding TowageOnDepartureDraught_DMT, StringFormat={}{0:N1}}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textGrossTonnage}" Binding="{Binding TowageOnDepartureGrossTonnage}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textLengthOverAll}" Binding="{Binding TowageOnDepartureLengthOverall_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textBeamOverAll}" Binding="{Binding TowageOnDepartureBeam_MTR, StringFormat={}{0:N2}}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textRemarks}" Binding="{Binding TowageOnDepartureRemarks}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textCompanyName}" Binding="{Binding TowageOnDepartureOperatorCompanyName}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textStreetNumber}" Binding="{Binding TowageOnDepartureOperatorStreetNameAndNumber}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textPostalCode}" Binding="{Binding TowageOnDepartureOperatorPostalCode}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textCity}" Binding="{Binding TowageOnDepartureOperatorCity}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textCountry}" Binding="{Binding TowageOnDepartureOperatorCountry}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textEMail}" Binding="{Binding TowageOnDepartureOperatorEmail}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textPhone}" Binding="{Binding TowageOnDepartureOperatorPhone}" IsReadOnly="True" Width="Auto" />
+                        <DataGridTextColumn Header="{x:Static p:Resources.textFax}" Binding="{Binding TowageOnDepartureOperatorFax}" IsReadOnly="True" Width="Auto" />
                     </DataGrid.Columns>
                 </enictrl:ENIDataGrid>
 
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml b/ENI2/SheetDisplayControls/VoyageControl.xaml
index 62694c75..e44e3624 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml
@@ -220,7 +220,7 @@
                 <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="280"/>
+                            <ColumnDefinition Width="290"/>
                             <ColumnDefinition Width=".3*" />
                             <ColumnDefinition Width=".3*" />
                         </Grid.ColumnDefinitions>
@@ -247,7 +247,7 @@
                         <TextBlock FontSize="18" VerticalAlignment="Bottom" Text="{x:Static p:Resources.text110MaritimeHealthData}" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="3"/>
 
                         <TextBlock Grid.Row="1" Grid.RowSpan="2" Text="{x:Static p:Resources.textPersonDiedOnBoard}" Name="textBlock_PersonsDiedOnBoard" Margin="0,0,10,0" TextWrapping="Wrap" VerticalAlignment="Top"/>
-                        <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"/>
+                        <CheckBox Name="checkBoxHavePersonsDied" IsChecked="{Binding NonAccidentalDeathsDuringVoyage}" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" />
                         <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0"  Content="{x:Static p:Resources.textNumberOfDeaths}" Name="label_NumberOfDeaths" Margin="0,0,10,0"/>
                         <xctk:IntegerUpDown Name="integerUpDownNumberOfDeaths" Grid.Row="2" Grid.Column="1" Value="{Binding NonAccidentalDeathsDuringVoyageCount}" Margin="2" ShowButtonSpinner="False" TextAlignment="Left"/>
                         <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.textDiseaseInfectiousNature}" Name="textBlock_diseaseInfectious"  TextWrapping="Wrap"  Margin="0,0,10,0"/>
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml.cs b/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
index a574ae3c..b652fe95 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml.cs
@@ -182,13 +182,16 @@ namespace ENI2.SheetDisplayControls
 
             this.checkBoxStowaways.DataContext = _bpol;
             this.checkBoxCruiseShip.DataContext = _bpol;
+            this.checkBoxCruiseShip.Checked += CheckBoxCruiseShip_Checked;
+            this.checkBoxCruiseShip.Unchecked += CheckBoxCruiseShip_Checked;
+            this.CheckBoxCruiseShip_Checked(null, null);
             this.dataGridPortOfItinerary.Initialize();
             this.dataGridPortOfItinerary.ItemsSource = _bpol.PortOfItineraries;
             this.dataGridPortOfItinerary.AddingNewItem += DataGridPortOfItinerary_AddingNewItem;
             this.dataGridPortOfItinerary.EditRequested += DataGridPortOfItinerary_EditRequested;
             this.dataGridPortOfItinerary.DeleteRequested += DataGridPortOfItinerary_DeleteRequested;
             this.dataGridPortOfItinerary.CreateRequested += DataGridPortOfItinerary_CreateRequested;
-        }
+        }        
 
         public override void SetEnabled(bool enabled)
         {
@@ -251,7 +254,7 @@ namespace ENI2.SheetDisplayControls
         }        
 
         private void checkBoxKielCanalPassagePlanned_Checked(object sender, RoutedEventArgs e)
-        {
+        {            
             this.dateTimePickerKielCanalPassagePlannedIncomming.IsEnabled = this.checkBoxKielCanalPassagePlanned.IsChecked ?? false;
             this.dateTimePickerKielCanalPassagePlannedOutgoing.IsEnabled = this.checkBoxKielCanalPassagePlanned.IsChecked ?? false;
         }
@@ -284,6 +287,12 @@ namespace ENI2.SheetDisplayControls
             this.dataGridSanitaryMeasures.IsReadOnly = !(this.checkBoxSanitaryMeasuresApplied.IsChecked ?? false);
         }
 
+        private void CheckBoxCruiseShip_Checked(object sender, RoutedEventArgs e)
+        {
+            this.buttonImportPortOfItineraryFromSEC.IsEnabled = this.checkBoxCruiseShip.IsChecked ?? false;
+            this.dataGridPortOfItinerary.IsEnabled = this.checkBoxCruiseShip.IsChecked ?? false;
+        }
+
         private void buttonImportExcelLast10PortFacilities_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog ofd = new OpenFileDialog
@@ -1032,6 +1041,6 @@ namespace ENI2.SheetDisplayControls
         }
 
         #endregion
-                
+        
     }
 }
diff --git a/bsmd.database/NOA_NOD.cs b/bsmd.database/NOA_NOD.cs
index 5969dec3..b726366f 100644
--- a/bsmd.database/NOA_NOD.cs
+++ b/bsmd.database/NOA_NOD.cs
@@ -83,7 +83,7 @@ namespace bsmd.database
         public DateTime? ETAToNextPort { get; set; }
 
         [ENI2Validation]
-        public bool? IsAnchored { get; set; }
+        public bool? IsAnchored { get; set; } = false;
 
         #endregion
 
diff --git a/bsmd.database/PRE72H.cs b/bsmd.database/PRE72H.cs
index 012886d8..797e7105 100644
--- a/bsmd.database/PRE72H.cs
+++ b/bsmd.database/PRE72H.cs
@@ -28,7 +28,7 @@ namespace bsmd.database
         [Validation(ValidationCode.NOT_NULL)]
         [LookupName("PRE72H.Tanker")]
         [ENI2Validation]
-        public bool? Tanker { get; set; }
+        public bool? Tanker { get; set; } = false;
 
         [ShowReport]
         [ENI2Validation]
diff --git a/bsmd.database/SEC.cs b/bsmd.database/SEC.cs
index d4dc1641..c4d77ac1 100644
--- a/bsmd.database/SEC.cs
+++ b/bsmd.database/SEC.cs
@@ -140,7 +140,7 @@ namespace bsmd.database
         public byte? GeneralDescriptionOfCargo { get; set; }
 
         [ENI2Validation]
-        public bool? AreMatterToReport { get; set; }
+        public bool? AreMatterToReport { get; set; } = false;
 
         [LookupName("SEC.MatterToReport")]
         [MaxLength(1024)]