diff --git a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
index 8a70cdbb..41a91e25 100644
--- a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
+++ b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs
@@ -99,13 +99,13 @@ namespace ZUGFeRDRESTService.Controllers
                 _AllowXRechnung = false;
             }
 
-            if (!bool.TryParse(oZugferdConfig["Zugferd2x"], out _AllowZugferd2x))
+            if (!bool.TryParse(oZugferdConfig["AllowZugferd2x"], out _AllowZugferd2x))
             {
                 _logger.Info("Configuration Zugferd2x was not set. Using default value [{0}]", false);
                 _AllowZugferd2x = false;
             }
 
-            if (!bool.TryParse(oZugferdConfig["Zugferd10"], out _AllowZugferd10))
+            if (!bool.TryParse(oZugferdConfig["AllowZugferd10"], out _AllowZugferd10))
             {
                 _logger.Info("Configuration Zugferd10 was not set. Using default value [{0}]", true);
                 _AllowZugferd10 = true;
@@ -151,9 +151,7 @@ namespace ZUGFeRDRESTService.Controllers
 
                     _logger.Info("Detected Specification was: [{0}]", oZugferdResult.Specification);
 
-                    var oFilteredPropertyMap = _propertyMap.
-                        Where(kv => kv.Value.Specification == oZugferdResult.Specification).
-                        ToDictionary(kv => kv.Key, kv => kv.Value);
+                    var oFilteredPropertyMap = _zugferd.FilterPropertyMap(_propertyMap, oZugferdResult.Specification); 
 
                     if (oFilteredPropertyMap.Count == 0)
                     {