diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 4aa746d3..96e3f7fe 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>17</ApplicationRevision>
-    <ApplicationVersion>7.0.0.17</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>7.0.1.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index c1157675..5828924b 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -402,7 +402,7 @@ namespace ENI2.Excel
 
                     if (date != null)
                     {
-                        if ((date.Value < new DateTime(1899, 1, 1)) || (date.Value > new DateTime(2030, 1, 1)))
+                        if ((date.Value < new DateTime(1899, 1, 1)) || (date.Value > new DateTime(2130, 1, 1)))
                         {
                             date = null; // this can't be right                     
                         }                        
diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index 779f8f53..78041839 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -114,13 +114,14 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Issuing state")]
-        [Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberIdentityDocumentIssuingState { get; set; }
 
         [ShowReport]
         [ReportDisplayName("Expiry date")]
+        [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
         public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }
 
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index 4131f729..f367423b 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -118,13 +118,14 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Issuing state")]
-        [Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [ENI2Validation]
         public string PassengerIdentityDocumentIssuingState { get; set; }
 
 
         [ShowReport]
         [ReportDisplayName("Expiry date")]
+        [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
         public DateTime? PassengerIdentityDocumentExpiryDate { get; set; }
 
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 6e8330e2..6c462a7b 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.0.0")]
+[assembly: AssemblyInformationalVersion("7.0.1")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index ee7ffbc1..b1f00991 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.0.0.*")]
+[assembly: AssemblyVersion("7.0.1.*")]
 
diff --git a/misc/EU-NoAD-Data-Collecting-Tool-5_0.xlsx b/misc/EU-NoAD-Data-Collecting-Tool-5_0.xlsx
index e04528f8..3d8ae0e2 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