diff --git a/binaries/data/mods/public/maps/scenarios/Round_256r.pmp b/binaries/data/mods/internal/maps/scenarios/Round_256r.pmp
similarity index 100%
rename from binaries/data/mods/public/maps/scenarios/Round_256r.pmp
rename to binaries/data/mods/internal/maps/scenarios/Round_256r.pmp
diff --git a/binaries/data/mods/internal/maps/scenarios/Round_256r.xml b/binaries/data/mods/internal/maps/scenarios/Round_256r.xml
new file mode 100644
index 0000000000..d01cc6cc82
--- /dev/null
+++ b/binaries/data/mods/internal/maps/scenarios/Round_256r.xml
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff49bafebb106bce557aada05f4e9b5c81972e8e569cd3320bdc53a27b55d360
+size 1285
diff --git a/binaries/data/mods/internal/maps/scenarios/salute.xml b/binaries/data/mods/internal/maps/scenarios/salute.xml
index 4f07c42173..8602c66461 100644
--- a/binaries/data/mods/internal/maps/scenarios/salute.xml
+++ b/binaries/data/mods/internal/maps/scenarios/salute.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:440ccc97ac47377ae9745de5262c58285e2855cfc616025c6f82ba5bc11d3a0b
-size 8445
+oid sha256:c7e68337d52edf705b60dc7494a0e5d3ce08b6f944eb23763ba939ec6db55e76
+size 8464
diff --git a/binaries/data/mods/public/gui/gamesetup/gamesetup.js b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
index 0f790f7b16..20663a5bd7 100644
--- a/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ b/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -81,9 +81,8 @@ function init(attribs)
 	mapTypes.list_data = ["scenario"];
 	
 	// Setup map filters - will appear in order they are added
-	addFilter("Default", function(settings) { return settings && !keywordTestOR(settings.Keywords, ["demo", "test"]); });
+	addFilter("Default", function(settings) { return settings && !keywordTestOR(settings.Keywords, ["demo", "hidden"]); });
 	addFilter("Demo Maps", function(settings) { return settings && keywordTestAND(settings.Keywords, ["demo"]); });
-	addFilter("Test Maps", function(settings) { return settings && keywordTestAND(settings.Keywords, ["test"]); });
 	addFilter("Old Maps", function(settings) { return !settings; });
 	addFilter("All Maps", function(settings) { return true; });
 	
diff --git a/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml b/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml
index 7623c4f16f..f7dc00224b 100644
--- a/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Hellenic Buildings.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2212404f869fa9963f5980e46c19201af6614efd47e9ffb741c629f82628dd3
-size 81563
+oid sha256:5ab9b8f86de26e45e4fdb6f7099b5b9dcccb39e3a636caecab1bffea9225ccba
+size 81587
diff --git a/binaries/data/mods/public/maps/scenarios/Round_256r.xml b/binaries/data/mods/public/maps/scenarios/Round_256r.xml
deleted file mode 100644
index 1bae8188fa..0000000000
--- a/binaries/data/mods/public/maps/scenarios/Round_256r.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbae08c5ed1a7ca5779f7959f90ecff5d1b7ec346bd476182b79802a21f82599
-size 1283
diff --git a/binaries/data/mods/public/maps/scenarios/_default.xml b/binaries/data/mods/public/maps/scenarios/_default.xml
index 6c3fa942c4..b5f6afb3a0 100644
--- a/binaries/data/mods/public/maps/scenarios/_default.xml
+++ b/binaries/data/mods/public/maps/scenarios/_default.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c59956bfd2502218fac48e987ac26b32436901fde4096baec3bb81757c5c31e
-size 1345
+oid sha256:11974496de6fda5d5c21bad61de1515be486120e4154b31d3bd12e4769f6fb98
+size 1371