diff --git a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
index 8398b50e92336077710146511a41dfe7ec333266..934dbb57041e85b81ab9e7fc1d204ed342af0378 100644
--- a/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
+++ b/VectoCore/VectoCore/OutputData/FileIO/FileOutputWriter.cs
@@ -103,7 +103,7 @@ namespace TUGraz.VectoCore.OutputData.FileIO
 				modFileName = string.Format("{0}{1}", runName, Constants.FileExtensions.ModDataFile);
 			}
 
-			return Path.Combine(BasePath, modFileName);
+			return Path.Combine(BasePath, string.Concat(modFileName.Split(Path.GetInvalidFileNameChars())));
 		}
 
 		public void WriteModData(int jobRunId, string runName, string cycleName, string runSuffix, DataTable modData)
diff --git a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
index fb5760706a4bf55ffdc7d8c02478ed517f7c39f3..9beb79413a83cd0399657065896cf59e72a7ba94 100644
--- a/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/VAUX/SP-Table.csv
@@ -8,7 +8,7 @@ HDV Group , Long haul , Regional delivery , Urban delivery , Municipal utility ,
 7         ,           ,                   ,                ,                   ,
 8         ,           ,                   ,                ,                   ,
 9         , 600/120/0 , 490/60/40         , 440/50/50      , 430/30/50         , 640/50/80
-10        , 450/120/0 , 440/90/40         ,                ,                   , 640/50/80
-11        , 600/120/0 , 490/60/40         ,                , 430/30/50         , 640/50/80
-12        , 450/120/0 , 440/90/40         ,                ,                   , 640/50/80
-16        ,           ,                   ,                ,                   , 640/50/80
\ No newline at end of file
+10        , 450/120/0 , 440/90/40         , 390/80/50      ,                   , 640/50/80
+11        , 600/120/0 , 490/60/40         , 370/60/50      , 430/30/50         , 640/50/80
+12        , 450/120/0 , 440/90/40         , 390/80/50      ,                   , 640/50/80
+16        , 490/100/0 , 550/90/40         , 490/80/60      ,                   , 640/50/80
\ No newline at end of file