diff --git a/src/pregmod/basenationalitiesControls.tw b/src/pregmod/basenationalitiesControls.tw
index 680769a7e3ce3696df808b923763d35ae411114b..8f7586a9c08ba6b7213b9c83ef0584f573aa77c5 100644
--- a/src/pregmod/basenationalitiesControls.tw
+++ b/src/pregmod/basenationalitiesControls.tw
@@ -42,7 +42,7 @@ Filter by Race:
 	<<else>>
 		<<print "
 			<<link _race>>
-				<<set $baseControlsFilter to setup.filterRaces[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
+				<<set $baseControlsFilter = setup.filterRaces[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
 				<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
 			<</link>>
 		">>
@@ -60,7 +60,7 @@ Filter by Region:
 	<<else>>
 		<<print "
 			<<link _region>>
-				<<set $baseControlsFilter to setup.filterRegions[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
+				<<set $baseControlsFilter = setup.filterRegions[" + _i + "].toLowerCase().replace(/[ -]/g, '')>>
 				<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
 			<</link>>
 		">>
@@ -130,37 +130,38 @@ Filter by Region:
 <<else>>
 /* Filtered pop controls */
 	<<set _controlsNationality = setup[$baseControlsFilter+'Nationalities']>>
-	<<for _i = 0; _i < _controlsNationality.length; _i++>>
+	<<set _keys = Object.keys(_controlsNationality)>>
+	<<for _i = 0; _i < _keys.length; _i++>>
 		<div style="float: left;">
-		<<set _nation = _controlsNationality[_i]>>
+		<<set _nation = _keys[_i]>>
 		<<print "
 		_nation 
 			@@.plusButton;<<link '+'>>
-				<<set hashPush($nationalities, _controlsNationality[" + _i + "])>>
-				<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
-			<</link>>@@
-		">>
-	<<if def $nationalitiescheck[_nation]>>
-		<<print "
-			@@.minusButton;<<link '–'>>
-				<<set $nationalities[_controlsNationality["+_i+"]] -= 1>>
-				<<if $nationalities[_controlsNationality["+_i+"]] <= 0>>
-					<<set delete $nationalities[_controlsNationality["+_i+"]]>>
-				<</if>>
+				<<set hashPush($nationalities, _keys[" + _i + "])>>
 				<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
 			<</link>>@@
 		">>
+		<<if def $nationalitiescheck[_nation]>>
+			<<print "
+				@@.minusButton;<<link '–'>>
+					<<set $nationalities[_keys["+_i+"]] -= 1>>
+					<<if $nationalities[_keys["+_i+"]] <= 0>>
+						<<set delete $nationalities[_keys["+_i+"]]>>
+					<</if>>
+					<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
+				<</link>>@@
+			">>
+			<</if>>
+		<<if $nationalities[_nation] > 1 >>
+			<<print "
+				@@.zeroButton;<<link '0'>>
+					<<set delete $nationalities[_keys["+_i+"]]>>
+					<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
+				<</link>>@@
+			">>
 		<</if>>
-	<<if $nationalities[_nation] > 1 >>
-		<<print "
-			@@.zeroButton;<<link '0'>>
-				<<set delete $nationalities[_controlsNationality["+_i+"]]>>
-				<<replace '#PopControl'>><<include 'Basenationalities Controls'>><</replace>>
-			<</link>>@@
-		">>
-	<</if>>
-	<<if _i < _controlsNationality.length-1>>|&nbsp;<</if>>
-	</div>
+		<<if _i < _keys.length-1>>|&nbsp;<</if>>
+		</div>
 	<</for>>
 <</if>>
 <div style="clear: both; height: 0;"></div>