diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 880cdfc2b..6b9c0ae04 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -5197,6 +5197,11 @@ return;
 			return preg_replace('/[^\w]/',"",$text);
 		}
 
+		if($type === 'wd') // words and digits only.
+		{
+			return preg_replace('/[^\w\d]/',"",$text);
+		}
+
 		if($type === 'wds') // words, digits and spaces only.
 		{
 			return preg_replace('/[^\w\d ]/',"",$text);
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 83bd394c2..1f697db89 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -2002,7 +2002,7 @@ class e_menu_layout
 
 		$themeFileContent = preg_replace('/\(\s?THEME\s?\./', '( e_THEME. "'.$theme.'/" .', str_replace($srch, '', $themeFileContent));
 
-		$themeFileContent = str_replace('tablestyle', $theme."_tablestyle",$themeFileContent); // rename function to avoid conflicts while parsing.
+		$themeFileContent = str_replace('tablestyle', $tp->filter($theme, 'wd')."_tablestyle",$themeFileContent); // rename function to avoid conflicts while parsing.
 
 		try
 		{