diff --git a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
index 53af7076..5ee0d56c 100644
--- a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
@@ -63,7 +63,6 @@ namespace ZUGFeRDRESTService.Controllers
 
             _database = database;
             var oGDPictureKey = database.GetGDPictureKey();
-            var oPropertyMapList = database.GetPropertyMapList();
 
             _zugferd = new ZUGFeRDInterface(_logConfig, oGDPictureKey, new ZugferdOptions()
             {
@@ -76,7 +75,9 @@ namespace ZUGFeRDRESTService.Controllers
             });
             _props = new PropertyValues(_logConfig);
 
-            _logger.Debug("Property Map list initial: [{0}] entries found.", oPropertyMapList.Count);
+            var oPropertyMapList = database.GetPropertyMapList();
+            _propertyMapList.AddRange(oPropertyMapList);
+            _logger.Debug("Property Map list initial: [{0}] entries found. [{1}] entries will be available.", oPropertyMapList.Count, _propertyMapList.Count);
 
             _logger.Debug("Validation Controller initialized!");
         }
@@ -104,6 +105,12 @@ namespace ZUGFeRDRESTService.Controllers
                 _AllowZugferd2x = false;
             }
 
+            if (!bool.TryParse(oZugferdConfig["AllowZugferd23x"], out _AllowZugferd23x))
+            {
+                _logger.Info("Configuration Zugferd23x was not set. Using default value [{0}]", false);
+                _AllowZugferd23x = false;
+            }
+
             if (!bool.TryParse(oZugferdConfig["AllowZugferd10"], out _AllowZugferd10))
             {
                 _logger.Info("Configuration Zugferd10 was not set. Using default value [{0}]", true);
diff --git a/WEBSERVICES/ZUGFeRDRESTService/Database.cs b/WEBSERVICES/ZUGFeRDRESTService/Database.cs
index de492466..c04bdb28 100644
--- a/WEBSERVICES/ZUGFeRDRESTService/Database.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Database.cs
@@ -57,7 +57,7 @@ namespace ZUGFeRDRESTService
                 _propertyMapList = new List<XmlItemProperty>();
                 var oDatatable = MSSQL.GetDatatable(QUERY_GET_PROPERTY_MAP);
 
-                _Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows);
+                _Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows.Count);
 
                 foreach (DataRow oRow in oDatatable.Rows)
                 {