diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
index cd5c4178..5abb4a01 100644
--- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
@@ -265,7 +265,7 @@ namespace ENI2
 
                                 if(existingCore.IsTransit && 
                                 (existingMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) && 
-                                (existingMessage.InternalStatus == Message.BSMDStatus.SENT))
+                                (existingMessage.InternalStatus == Message.BSMDStatus.CONFIRMED))
                                 {
                                     skipCopyTransit = true;
                                     continue;
@@ -273,7 +273,7 @@ namespace ENI2
 
                                 if(!existingCore.IsTransit &&
                                 (existingMessage.MessageNotificationClass == Message.NotificationClass.VISIT) &&
-                                (existingMessage.InternalStatus == Message.BSMDStatus.SENT))
+                                (existingMessage.InternalStatus == Message.BSMDStatus.CONFIRMED))
                                 {
                                     skipCopyVisit = true;
                                     continue;
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
index f5a238b3..1d684669 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
@@ -241,13 +241,20 @@ namespace ENI2.DetailViewControls
                     foreach (LastTenPortFacilitiesCalled l10fc in _sec.LastTenPortFacilitesCalled)
                     {
                         //if (l10fc.PortFacilityDateOfDeparture.HasValue &&
-                        //((DateTime.Now - l10fc.PortFacilityDateOfDeparture.Value).TotalDays < 31))
+                        //((DateTime.Now - l10fc.PortFacilityDateOfDeparture.Value).TotalDays < 31))                        
                         //{
+                        DateTime? eta = null;
+                        if (l10fc.PortFacilityDateOfArrival.HasValue)
+                        {
+                            eta = new DateTime(l10fc.PortFacilityDateOfArrival.Value.Year, l10fc.PortFacilityDateOfArrival.Value.Month,
+                                l10fc.PortFacilityDateOfArrival.Value.Day, 11, 11, 11).ToUniversalTime();
+                        }                        
+
                         PortOfItinerary poi = new PortOfItinerary
                         {
                             Identifier = PortOfItinerary.GetNewIdentifier(this._bpol.PortOfItineraries),
                             BPOL = this._bpol,
-                            PortOfItineraryETA = l10fc.PortFacilityDateOfArrival,
+                            PortOfItineraryETA = eta,
                             PortOfItineraryLocode = l10fc.PortFacilityPortLoCode,
                             PortOfItineraryName = l10fc.PortFacilityPortName
                         };
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
index cfd06d26..78a86317 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml
@@ -80,7 +80,12 @@
                     <CheckBox Name="checkBoxSickAnimalsOrPets" IsChecked="{Binding SickAnimalOrPetOnBoard}" Grid.Row="12" Grid.Column="1" VerticalAlignment="Center"/>
                     <CheckBox Name="checkBoxSanitaryControlExemption" IsChecked="{Binding ValidSanitaryControlExemptionOrCertificateOnBoard}" Grid.Row="13" Grid.Column="1" VerticalAlignment="Center"/>
                     <TextBox Name="textBoxPlaceOfIssue" Grid.Row="14" Grid.Column="1" MaxLength="100" Text="{Binding PlaceOfIssue}" Margin="2" />
-                        <DatePicker Name="datePickerDateOfIssue" Grid.Row="14" Grid.Column="3" SelectedDate="{Binding DateOfIssue, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" />
+                        <DatePicker Name="datePickerDateOfIssue" Grid.Row="14" Grid.Column="3" SelectedDate="{Binding DateOfIssue, Mode=TwoWay}" Margin="2" ContextMenu="{DynamicResource ClearContextMenu}" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+                            <DatePicker.BlackoutDates>
+                                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                            </DatePicker.BlackoutDates>
+                        </DatePicker>
                     <CheckBox Name="checkBoxReinspectionSanitary" IsChecked="{Binding SanitaryControlReinspectionRequired}" Grid.Row="15" Grid.Column="1" VerticalAlignment="Center"/>
                 </Grid>
                 </ScrollViewer>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
index ccb12adc..e7508088 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI-2/ENI2/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" />
-                <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay}" Margin="2" VerticalContentAlignment="Center"/>
+                <TextBox Name="textBoxTicketNo" Grid.Column="1" Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding TicketNo, Mode=TwoWay}" Margin="2" VerticalContentAlignment="Center" MaxLength="50"/>
 
                 <Label Grid.Column="0" Grid.Row="6" Margin="0,0,10,0" HorizontalContentAlignment="Right" Name="labelBSMDStatusInternal" Content="{Binding BSMDStatusInternal, StringFormat={}{0}}" VerticalContentAlignment="Center" FontWeight="Bold" />
                 <Button IsEnabled="True" Name="buttonStorno" Grid.Column="1" Grid.Row="6" Margin="2" Click="buttonStorno_Click" Content="{x:Static p:Resources.textCancelDeclaration}"/>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
index 3acdb276..66516d2e 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml
@@ -46,7 +46,12 @@
             <Label Content="{x:Static p:Resources.textPlannedInspection}" Grid.Column="0" Grid.Row="6" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
             <TextBox Text="{Binding PlannedWorks, Mode=TwoWay}" Name="textBoxPlannedWorks" Grid.Column="1" Grid.Row="6"  Margin="2,2,2,2" MaxLength="255" />
             <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" />
+                <DatePicker Grid.Column="1" Grid.Row="7" Name="datePickerLastExpandedInspection" VerticalAlignment="Center" SelectedDate="{Binding DateOfLastExpandedInspection, Mode=TwoWay}"  Margin="2,2,2,2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+                    <DatePicker.BlackoutDates>
+                        <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                        <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                    </DatePicker.BlackoutDates>
+                </DatePicker>
             <Label Content="{x:Static p:Resources.textPlannedPeriodOfStay}" Grid.Column="0" Grid.Row="8" HorizontalContentAlignment="Right" Margin="0,0,10,0"/>
             <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>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
index 7f25fba1..eae0e6b3 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml
@@ -83,7 +83,13 @@
                     <TextBox Name="textBoxReasonsForNoValidISSC" Grid.Row="13" Grid.Column="3" MaxLength="255" Text="{Binding ReasonsForNoValidISSC}" Margin="2" VerticalContentAlignment="Center"/>
                     <ComboBox Name="comboBoxISSCType" Grid.Row="14" Grid.Column="1" SelectedIndex="{Binding ISSCType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
                     <ComboBox Name="comboBoxISSCIssuerType" Grid.Row="14" Grid.Column="3" SelectedIndex="{Binding ISSCIssuerType, Converter={util:ByteConverter}}" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
-                    <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" />
+                        <DatePicker Name="datePickerISSCDateOfExpiration" Grid.Row="15" Grid.Column="1" SelectedDate="{Binding ISSCDateOfExpiration}" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+                            <DatePicker.BlackoutDates>
+                                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                            </DatePicker.BlackoutDates>
+
+                        </DatePicker>
                     <TextBox Name="textBoxISSCIssuerName" Grid.Row="15" Grid.Column="3" MaxLength="100" Text="{Binding ISSCIssuerName}" Margin="2" VerticalContentAlignment="Center"/>
                     <CheckBox Name="checkBoxApprovedSecurityPlanOnBoard" IsChecked="{Binding ApprovedSecurityPlanOnBoard}" Grid.Row="17" Grid.Column="1" VerticalAlignment="Center"/>
                     <TextBox Name="textBoxPortFacilityOfArrival" Grid.Row="18" Grid.Column="1" MaxLength="100" Text="{Binding PortFacilityOfArrival}" Margin="2" VerticalContentAlignment="Center"/>
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
index 99bf5399..6de49637 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml
@@ -44,7 +44,12 @@
                     <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness, Mode=TwoWay}" />
                     <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption, Mode=TwoWay}" />
                     <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxWasteDisposal" Margin="2" SelectedIndex="{Binding WasteDisposalDelivery, Mode=TwoWay}"/>
-                    <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" />
+                    <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+                        <DatePicker.BlackoutDates>
+                            <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                        </DatePicker.BlackoutDates>
+                    </DatePicker>
                     <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" />
                     <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="2" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText}" Margin="2" />
                     <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index e71de3c5..d2855573 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -35,7 +35,7 @@
     <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>5.0.12.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI-2/ENI2/ENI2/EditControls/CopyDeclarationDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/CopyDeclarationDialog.xaml
index dafc35bd..9677dcd1 100644
--- a/ENI-2/ENI2/ENI2/EditControls/CopyDeclarationDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/CopyDeclarationDialog.xaml
@@ -58,7 +58,12 @@
                                   ParsingNumberStyle="Integer"
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2" Width="Auto" x:Name="locodePoC" />
-        <DatePicker Name="datePickerETA" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" />
+        <DatePicker Name="datePickerETA" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <ComboBox Name="comboBoxInitialHIS" Grid.Row="5" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" DisplayMemberPath="Value" SelectedValuePath="Key" SelectionChanged="comboBoxInitialHIS_SelectionChanged"/>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml
index 6b84e7bc..deaed5d3 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditCREWDialog.xaml
@@ -40,7 +40,13 @@
         <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxGender" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
         <TextBox Grid.Row="2" Grid.Column="3" Width="auto" Name="textBoxPlaceOfBirth" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}"/>
-        <DatePicker Grid.Row="3" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" />
+        <DatePicker Grid.Row="3" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/1900"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+            
+        </DatePicker>
         <ComboBox Grid.Row="4" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" ContextMenu="{DynamicResource ClearContextMenu}" />
         <TextBox Grid.Row="4" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="5" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditInfectedAreaDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditInfectedAreaDialog.xaml
index f38d18e5..203ade1e 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditInfectedAreaDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditInfectedAreaDialog.xaml
@@ -20,6 +20,11 @@
         <Label Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textInfectedAreaPort}" />
         <Label Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textInfectedAreaDate}" />
         <TextBox Name="textBoxInfectedAreaPort" Grid.Row="0" Grid.Column="1" Margin="2"/>
-        <DatePicker Grid.Row="1" Grid.Column="1" Name="datePickerInfectedAreaDate" Margin="2" />
+        <DatePicker Grid.Row="1" Grid.Column="1" Name="datePickerInfectedAreaDate" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
index 7f605dbb..e7ea731b 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml
@@ -39,8 +39,18 @@
         <enictrl:LocodeControl Grid.Row="0" Grid.Column="1" x:Name="locodePort" />
         <TextBox Name="textBoxPortName" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxPortCountry" Grid.Row="2" Grid.Column="1" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
-        <DatePicker Name="datePickerATA" Grid.Row="3" Grid.Column="1" Margin="2" />
-        <DatePicker Name="datePickerATD" Grid.Row="4" Grid.Column="1" Margin="2" />
+        <DatePicker Name="datePickerATA" Grid.Row="3" Grid.Column="1" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
+        <DatePicker Name="datePickerATD" Grid.Row="4" Grid.Column="1" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <ComboBox Name="comboBoxShipSecurityLevel" Grid.Row="5" Grid.Column="1" Margin="2" />
         <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxGisisDescription" Grid.Row="7" Grid.Column="1" Margin="2" IsEnabled="False"/>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml
index 7cdb4d4c..7db0bca8 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditPasDialog.xaml
@@ -42,7 +42,12 @@
         <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxGender" Margin="2"  IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True"/>
         <TextBox Grid.Row="1" Grid.Column="3" Width="auto" Name="textBoxPlaceOfBirth" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <ComboBox Grid.Row="2" Grid.Column="1" Name="comboBoxNationality" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
-        <DatePicker Grid.Row="2" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" />
+        <DatePicker Grid.Row="2" Grid.Column="3" Name="datePickerDateOfBirth" Margin="2" DisplayDateStart="1/1/1900" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/1900"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <ComboBox Grid.Row="3" Grid.Column="1" Name="comboBoxIdDocType" Margin="2" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
         <TextBox Grid.Row="3" Grid.Column="3" Width="auto" Name="textBoxIdDocNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
         <TextBox Grid.Row="4" Grid.Column="1" Width="auto" Name="textBoxVisaNumber" Margin="2" MaxLength="100" VerticalContentAlignment="Center" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
index 6a3247e0..cec447a5 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditPortOfCallLast30DaysDialog.xaml
@@ -25,7 +25,12 @@
         <TextBlock Grid.Row="2" Grid.Column="0" Text="{x:Static p:Resources.textCrewMemberJoinTheShip}" TextWrapping="Wrap" FontSize="11" Margin="5,0,0,0"/>
         <TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.textCrewMembersJoined}" TextWrapping="Wrap" Margin="5,0,0,0"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="0" x:Name="locodeControlPortName" />
-        <DatePicker Name="datePickerATAPortOfCall" Grid.Column="1" Grid.Row="1" Margin="2"/>
+        <DatePicker Name="datePickerATAPortOfCall" Grid.Column="1" Grid.Row="1" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <CheckBox Name="checkBoxCrewMembersJoined" VerticalContentAlignment="Center" Grid.Column="1" Grid.Row="2" />
         <TextBox Name="textBoxCrewMemberNames" Grid.Column="1" Grid.Row="3" Margin="2" TextWrapping="Wrap"/>
     </Grid>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml
index 5e694deb..2d8f7a6d 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditSanitaryMeasureDialog.xaml
@@ -23,6 +23,11 @@
         <Label Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textSanitaryMeasureDate}" />
         <TextBox Name="textBoxSanitaryMeasureKind" Grid.Row="0" Grid.Column="1" Margin="2" MaxLength="255" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxSanitaryMeasurePlace" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="255" VerticalContentAlignment="Center"/>
-        <DatePicker Grid.Row="2" Grid.Column="2" Name="datePickerSanitaryMeasureDate" Margin="2" />
+        <DatePicker Grid.Row="2" Grid.Column="2" Name="datePickerSanitaryMeasureDate" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml
index 762b8541..2314de70 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditShip2ShipActivitiesDialog.xaml
@@ -38,8 +38,18 @@
         <enictrl:LocodeControl x:Name="locodeLocation" Grid.Row="0" Grid.Column="3" />
         <xctk:DoubleUpDown Name="doubleUpDownLatitudeDegrees" Grid.Row="1" Grid.Column="1"  Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
         <xctk:DoubleUpDown Name="doubleUpDownLongitudeDegrees" Grid.Row="1" Grid.Column="3" Margin="2" FormatString="N3" ShowButtonSpinner="False" TextAlignment="Left"/>
-        <DatePicker Name="datePickerFrom" Grid.Row="2" Grid.Column="1" Margin="2" />
-        <DatePicker Name="datePickerTo" Grid.Row="2" Grid.Column="3" Margin="2" />
+        <DatePicker Name="datePickerFrom" Grid.Row="2" Grid.Column="1" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
+        <DatePicker Name="datePickerTo" Grid.Row="2" Grid.Column="3" Margin="2" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <ComboBox Name="comboBoxActivityType" Grid.Row="4" Grid.Column="1" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" />
         <!--TextBox Name="textBoxActivityType" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Margin="2" MaxLength="255" /-->
         <TextBox Name="textBoxSecurityMatters" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Margin="2" MaxLength="255" />
diff --git a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
index d4d703ab..585c2846 100644
--- a/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml
@@ -57,8 +57,12 @@
                                   ButtonSpinnerLocation="Right"
                                   ParsingNumberStyle="Integer"
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
-        <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" Grid.ColumnSpan="2"
-                    SelectedDateChanged="datePickerETA_SelectedDateChanged" />
+        <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <ComboBox Name="comboBoxInitialHIS" Grid.Row="4" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" DisplayMemberPath="Value" SelectedValuePath="Key" SelectionChanged="comboBoxInitialHIS_SelectionChanged"/>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
index 93b13bcc..f07159aa 100644
--- a/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml
@@ -53,7 +53,12 @@
                                   ParsingNumberStyle="Integer"
                                   Watermark="Enter ENI" ValueChanged="doubleUpDownENI_ValueChanged" TextAlignment="Left"/>
         <enictrl:LocodeControl Grid.Column="1" Grid.Row="2" Width="Auto" x:Name="locodePoC" LocodeValue="{Binding PoC, Mode=TwoWay}" />
-        <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" />
+        <DatePicker Name="datePickerETA" Grid.Row="3" Grid.Column="1" Margin="2" SelectedDateChanged="datePickerETA_SelectedDateChanged" DisplayDateStart="1/1/2000" DisplayDateEnd="12/31/2199">
+            <DatePicker.BlackoutDates>
+                <CalendarDateRange Start="1/1/0001" End="1/1/2000"/>
+                <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+            </DatePicker.BlackoutDates>
+        </DatePicker>
         <ComboBox Name="comboBoxInitialHIS" Grid.Row="4" Grid.Column="1" Margin="2" Grid.ColumnSpan="2" DisplayMemberPath="Value" SelectedValuePath="Key" SelectionChanged="comboBoxInitialHIS_SelectionChanged"/>
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index afa637b8..0830d295 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/DBManager.cs b/nsw/Source/bsmd.database/DBManager.cs
index b6846535..d0341e7e 100644
--- a/nsw/Source/bsmd.database/DBManager.cs
+++ b/nsw/Source/bsmd.database/DBManager.cs
@@ -535,10 +535,10 @@ namespace bsmd.database
             }
             return result;
         }
-		
-		public void DeleteCore(MessageCore messageCore)
-		{
-			if(messageCore == null) return;
+        
+        public void DeleteCore(MessageCore messageCore)
+        {
+            if(messageCore == null) return;
 
             List<Message> coreMessages = this.GetMessagesForCore(messageCore, MessageLoad.ALL);
 
@@ -550,9 +550,9 @@ namespace bsmd.database
                 }
                 this.Delete(message);
             }
-			
-			this.Delete(messageCore);
-		}
+            
+            this.Delete(messageCore);
+        }
 
         public void Save(DatabaseEntity entity)
         {
diff --git a/nsw/Source/bsmd.database/SEC.cs b/nsw/Source/bsmd.database/SEC.cs
index 98dcbc52..c65fe0e1 100644
--- a/nsw/Source/bsmd.database/SEC.cs
+++ b/nsw/Source/bsmd.database/SEC.cs
@@ -348,6 +348,11 @@ namespace bsmd.database
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
 
+            if(this.MessageCore.IsTransit && (this.KielCanalPassagePlanned ?? false))
+            {
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.V705, "KielCanalPassagePlanned", null, this.Title, null, this.Tablename));
+            }
+
             if (this.GetValidationBlock() == ValidationBlock.BLOCK1)
             {
                 if (this.PortOfCallWhereCompleteSECNotified.IsNullOrEmpty())
diff --git a/nsw/Source/bsmd.database/ValidationAttribute.cs b/nsw/Source/bsmd.database/ValidationAttribute.cs
index 214e2b4b..c0f3dec6 100644
--- a/nsw/Source/bsmd.database/ValidationAttribute.cs
+++ b/nsw/Source/bsmd.database/ValidationAttribute.cs
@@ -56,6 +56,7 @@ namespace bsmd.database
         V702 = 702,
         V703 = 703,
         V704 = 704,
+        V705 = 705,
         V706 = 706,
         V721 = 721,
         V741 = 741,