diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties
index dfcb415..e9b9b81 100644
--- a/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties
+++ b/beatrun/gamemodes/beatrun/content/resource/localization/en/beatrun.properties
@@ -50,7 +50,7 @@ beatrun.hud.lvl=Lvl: %s
 beatrun.hud.infector=Infector
 
 # Menu_Course
-beatrun.coursemenu.trials=Courses - %s
+beatrun.coursemenu.trials=Courses - Folder: %s
 beatrun.coursemenu.buildmode=Toggle Build Mode
 beatrun.coursemenu.freeplay=Return to Freeplay
 
diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties
index 934424d..fe90302 100644
--- a/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties
+++ b/beatrun/gamemodes/beatrun/content/resource/localization/ru/beatrun.properties
@@ -50,7 +50,7 @@ beatrun.hud.lvl=Лвл: %s
 beatrun.hud.infector=Заражённый
 
 # Menu_Course
-beatrun.coursemenu.trials=Курсы - %s
+beatrun.coursemenu.trials=Курсы - Папка: %s
 beatrun.coursemenu.buildmode=Режим строительства
 beatrun.coursemenu.freeplay=Свободная игра
 
diff --git a/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties b/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties
index c8e3b7b..e616b40 100644
--- a/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties
+++ b/beatrun/gamemodes/beatrun/content/resource/localization/uk/beatrun.properties
@@ -50,7 +50,7 @@ beatrun.hud.lvl=Лвл: %s
 beatrun.hud.infector=Заражений
 
 # Menu_Course
-beatrun.coursemenu.trials=Курси - %s
+beatrun.coursemenu.trials=Курси - Папка: %s
 beatrun.coursemenu.buildmode=Режим будівництва
 beatrun.coursemenu.freeplay=Вільна гра
 
diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/Menu_Course.lua b/beatrun/gamemodes/beatrun/gamemode/cl/Menu_Course.lua
index 9b6f455..9080937 100644
--- a/beatrun/gamemodes/beatrun/gamemode/cl/Menu_Course.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/cl/Menu_Course.lua
@@ -25,7 +25,7 @@ local function buildmodebutton()
 	LocalPlayer():ConCommand("buildmode")
 end
 
-AEUI:Text(coursepanel, language.GetPhrase("beatrun.coursemenu.trials"):format(game.GetMap()), "AEUIVeryLarge", 20, 30)
+AEUI:Text(coursepanel, language.GetPhrase("beatrun.coursemenu.trials"):format(string.Replace(game.GetMap(), " ", "-")), "AEUIVeryLarge", 20, 30)
 
 local buildmodebutton = AEUI:AddButton(coursepanel, "#beatrun.coursemenu.buildmode", buildmodebutton, "AEUILarge", coursepanel.w - 400, coursepanel.h - 50)
 buildmodebutton.greyed = sacheck
@@ -55,7 +55,7 @@ function OpenCourseMenu()
 	AEUI:AddPanel(coursepanel)
 	AEUI:AddPanel(courselist)
 
-	local dir = "beatrun/courses/" .. game.GetMap() .. "/"
+	local dir = "beatrun/courses/" .. string.Replace(game.GetMap(), " ", "-") .. "/"
 	local dirsearch = dir .. "*.txt"
 	local files = file.Find(dirsearch, "DATA", "datedesc")
 
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/BuildMode.lua b/beatrun/gamemodes/beatrun/gamemode/sh/BuildMode.lua
index 9591127..5a5c7ea 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/BuildMode.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/BuildMode.lua
@@ -576,7 +576,7 @@ if SERVER then
 	end
 
 	function Beatrun_ReadCourseLocal(id)
-		local dir = "beatrun/courses/" .. game.GetMap() .. "/"
+		local dir = "beatrun/courses/" .. string.Replace(game.GetMap(), " ", "-") .. "/"
 		local save = file.Read(dir .. id .. ".txt", "DATA")
 
 		if not save then
@@ -943,7 +943,7 @@ if CLIENT then
 		local save = CourseData(name)
 		local jsonsave = util.TableToJSON(save)
 		local id = util.CRC(jsonsave)
-		local dir = "beatrun/courses/" .. game.GetMap() .. "/"
+		local dir = "beatrun/courses/" .. string.Replace(game.GetMap(), " ", "-") .. "/"
 
 		if compress == nil then compress = true end
 
@@ -1011,7 +1011,7 @@ if CLIENT then
 
 	--[[
 	concommand.Add("Beatrun_PrintCourse", function(ply, cmd, args, argstr)
-		local dir = "beatrun/courses/" .. game.GetMap() .. "/"
+		local dir = "beatrun/courses/" .. string.Replace(game.GetMap(), " ", "-") .. "/"
 		local save = file.Read(dir .. args[1] .. ".txt", "DATA")
 
 		if not save then
diff --git a/beatrun/gamemodes/beatrun/gamemode/shared.lua b/beatrun/gamemodes/beatrun/gamemode/shared.lua
index 00badd4..04e9c51 100644
--- a/beatrun/gamemodes/beatrun/gamemode/shared.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/shared.lua
@@ -1,4 +1,4 @@
-VERSION_GLOBAL = "1.0.21"
+VERSION_GLOBAL = "1.0.22"
 VERSION_LATEST = ""
 VERSION_CHECKED = false
 
diff --git a/version.txt b/version.txt
index ace256e..2fa3901 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.21
\ No newline at end of file
+1.0.22
\ No newline at end of file