diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index 59f0c610..e9ca5665 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -307,22 +307,24 @@ namespace bsmd.database
                 row[3] = crew.CrewMemberPlaceOfBirth ?? (object)DBNull.Value;
                 row[4] = crew.CrewMemberDateOfBirth ?? (object)DBNull.Value;
                 row[5] = crew.CrewMemberGender ?? (object)DBNull.Value;
-                row[6] = crew.CrewMemberNationality ?? (object)DBNull.Value;
+                row[6] = crew.CrewMemberNationality?.Substring(0,2) ?? (object)DBNull.Value;
                 row[7] = crew.CrewMemberIdentityDocumentType ?? (object)DBNull.Value;
                 row[8] = crew.CrewMemberIdentityDocumentId ?? (object)DBNull.Value;
                 row[9] = crew.CrewMemberVisaNumber ?? (object)DBNull.Value;
                 row[10] = crew.CrewMemberDuty ?? (object)DBNull.Value;
                 row[11] = crew.Identifier ?? (object)DBNull.Value;
                 row[12] = crew.IsDeparture;
-                row[13] = crew.CrewMemberIdentityDocumentIssuingState ?? (object)DBNull.Value;
+                row[13] = crew.CrewMemberIdentityDocumentIssuingState?.Substring(0,2) ?? (object)DBNull.Value;
                 row[14] = crew.CrewMemberIdentityDocumentExpiryDate ?? (object)DBNull.Value;
                 row[15] = crew.NotificationSchengen ?? (object)DBNull.Value;
                 row[16] = crew.NotificationPAX ?? (object)DBNull.Value;
-                row[17] = crew.CrewMemberCountryOfBirth ?? (object)DBNull.Value;
+                row[17] = crew.CrewMemberCountryOfBirth?.Substring(0,2) ?? (object)DBNull.Value;
                 row[18] = crew.Effects ?? (object)DBNull.Value;
                 result.Rows.Add(row);
             }
-            
+
+            result.TableName = this.tablename;
+
             return result;
         }
 
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index bb4523aa..2561b68f 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -390,6 +390,8 @@ namespace bsmd.database
                 result.Rows.Add(row);
             }
 
+            result.TableName = this.tablename;
+
             return result;
         }