diff --git a/dist/addons/sourcemod/plugins/empfun.smx b/dist/addons/sourcemod/plugins/empfun.smx
index caed47a953fc2799743ad56cb28fc5c4c8d9e64b..4480d50fabcd3dae70b5c95e548b329085467475 100644
Binary files a/dist/addons/sourcemod/plugins/empfun.smx and b/dist/addons/sourcemod/plugins/empfun.smx differ
diff --git a/dist/addons/sourcemod/scripting/empfun.sp b/dist/addons/sourcemod/scripting/empfun.sp
index e2f372ccfd243689eacbe8105ecf4f7cd53c3b51..e67fab2a4a1bba5d667460d9ed8675482fa8c623 100644
--- a/dist/addons/sourcemod/scripting/empfun.sp
+++ b/dist/addons/sourcemod/scripting/empfun.sp
@@ -10,7 +10,7 @@
 #include <SteamWorks>
 
 
-#define PluginVersion "1.14" 
+#define PluginVersion "1.15" 
 float pVersion; 
 
 // note linearmap field is unstable
@@ -246,7 +246,7 @@ public void SetScenarioName(char[] scenarioName)
 {
 	strcopy(currentScenario,sizeof(currentScenario),scenarioName);
 	
-	if(sc_gamedesc_scenario != INVALID_HANDLE)
+	if(sc_gamedesc_scenario != INVALID_HANDLE && StrContains(currentScenario, "override", true) == -1)
 	{
 		sc_gamedesc_scenario.SetString(scenarioName);
 	}
@@ -488,7 +488,6 @@ bool StartDefaultScenarioVote()
  	GetActingVoteListPath(path,sizeof(path));
 	kv.ImportFromFile(path);
 	kv.JumpToKey("scenarios");
-	kv.GotoFirstSubKey();
 	StartScenarioVote(kv);
 	delete kv;
 }
@@ -520,6 +519,8 @@ public bool StartScenarioVote(KeyValues kv)
 	int numOptions = 0;
 	int numPlayers = GetClientCount(true);
 	
+	kv.GotoFirstSubKey();
+	
 	do
 	{
 		
@@ -3710,8 +3711,7 @@ public Action Command_Scenario_Vote(int client, int args)
 			{
 				GetCmdArg(i, arg, sizeof(arg));
 				kv.JumpToKey(arg,true);
-				kv.SetString("tags_override","-");
-				kv.Rewind();
+				kv.GoBack();
 			}
 			StartScenarioVote(kv);
 			delete kv;
diff --git a/dist/updater.txt b/dist/updater.txt
index bf273cda517dff5d977446baabb4a147521d396b..dad75189dd637a78ed3424ff9a2608e6df7c57b2 100644
--- a/dist/updater.txt
+++ b/dist/updater.txt
@@ -4,7 +4,7 @@
 	{
 		"Version"
 		{
-			"Latest"	"1.14"
+			"Latest"	"1.15"
 		}
 	}