diff --git a/support_files/definitions/europe/bulgaria/cup_supercup_bulgaria.xml b/support_files/definitions/europe/bulgaria/cup_supercup_bulgaria.xml
index fdf0e7a6..55fa230d 100644
--- a/support_files/definitions/europe/bulgaria/cup_supercup_bulgaria.xml
+++ b/support_files/definitions/europe/bulgaria/cup_supercup_bulgaria.xml
@@ -14,19 +14,18 @@
       <neutral>1</neutral>
 
       <choose_teams>	
-	<choose_team>
-	  <choose_team_sid>bulgaria_national</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	  <choose_team_sid>bulgaria1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	  <choose_team_sid>bulgaria_national</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
 
     </cup_round>
diff --git a/support_files/definitions/europe/cyprus/cup_cyprus_supercup.xml b/support_files/definitions/europe/cyprus/cup_cyprus_supercup.xml
index ad271538..f094814e 100644
--- a/support_files/definitions/europe/cyprus/cup_cyprus_supercup.xml
+++ b/support_files/definitions/europe/cyprus/cup_cyprus_supercup.xml
@@ -14,19 +14,18 @@
       <neutral>1</neutral>
 
       <choose_teams>	
-	<choose_team>
-	  <choose_team_sid>cyprus_cup</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	  <choose_team_sid>cyprus1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	  <choose_team_sid>cyprus_cup</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
 
     </cup_round>
diff --git a/support_files/definitions/europe/france/cup_france_supercup.xml b/support_files/definitions/europe/france/cup_france_supercup.xml
index b4d66a54..cb03ea3e 100644
--- a/support_files/definitions/europe/france/cup_france_supercup.xml
+++ b/support_files/definitions/europe/france/cup_france_supercup.xml
@@ -13,19 +13,18 @@
       <home_away>0</home_away>
 
       <choose_teams>	
-	<choose_team>
-	  <choose_team_sid>france_coupe</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	  <choose_team_sid>france1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	  <choose_team_sid>france_coupe</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
 
     </cup_round>
diff --git a/support_files/definitions/europe/germany/cup_germany_supercup.xml b/support_files/definitions/europe/germany/cup_germany_supercup.xml
index 7f72683c..a91c8d27 100644
--- a/support_files/definitions/europe/germany/cup_germany_supercup.xml
+++ b/support_files/definitions/europe/germany/cup_germany_supercup.xml
@@ -14,21 +14,19 @@
       <neutral>1</neutral>
 
       <choose_teams>	
-	<choose_team>
-	  <choose_team_sid>germany_dfb</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	  <choose_team_sid>germany1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	  <choose_team_sid>germany_dfb</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
-
     </cup_round>
   </cup_rounds>
 </cup>
\ No newline at end of file
diff --git a/support_files/definitions/europe/hungary/cup_hungary_supercup.xml b/support_files/definitions/europe/hungary/cup_hungary_supercup.xml
index 90cd60cb..21ba28aa 100644
--- a/support_files/definitions/europe/hungary/cup_hungary_supercup.xml
+++ b/support_files/definitions/europe/hungary/cup_hungary_supercup.xml
@@ -13,19 +13,18 @@
       <neutral>1</neutral>
 
       <choose_teams>
-	<choose_team>
-	  <choose_team_sid>hungary_cup</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	  <choose_team_sid>hungary1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	  <choose_team_sid>hungary_cup</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
 
     </cup_round>
diff --git a/support_files/definitions/europe/malta/cup_malta_supercup.xml b/support_files/definitions/europe/malta/cup_malta_supercup.xml
index 8986f159..7de6355c 100644
--- a/support_files/definitions/europe/malta/cup_malta_supercup.xml
+++ b/support_files/definitions/europe/malta/cup_malta_supercup.xml
@@ -14,19 +14,18 @@
       <neutral>1</neutral>
 
       <choose_teams>	
-	<choose_team>
-	  <choose_team_sid>malta_cup</choose_team_sid>
-	  <number_of_teams>1</number_of_teams>
-	  <start_idx>1</start_idx>
-	  <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	  <choose_team_sid>malta1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	  <choose_team_sid>malta_cup</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
 
     </cup_round>
diff --git a/support_files/definitions/europe/portugal/cup_portugal_supercup.xml b/support_files/definitions/europe/portugal/cup_portugal_supercup.xml
index 2b4d6edd..e3d40e10 100644
--- a/support_files/definitions/europe/portugal/cup_portugal_supercup.xml
+++ b/support_files/definitions/europe/portugal/cup_portugal_supercup.xml
@@ -14,19 +14,18 @@
       <neutral>1</neutral>
 
       <choose_teams>
-	<choose_team>
-	 <choose_team_sid>portugal_cup</choose_team_sid>
-	 <number_of_teams>1</number_of_teams>
-	 <start_idx>1</start_idx>
-	 <end_idx>2</end_idx>
-	</choose_team>
-
 	<choose_team>
 	 <choose_team_sid>portugal1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <start_idx>1</start_idx>
 	  <end_idx>1</end_idx>
 	</choose_team>
+	<choose_team>
+	 <choose_team_sid>portugal_cup</choose_team_sid>
+	 <number_of_teams>1</number_of_teams>
+	 <start_idx>1</start_idx>
+	 <end_idx>2</end_idx>
+	</choose_team>
       </choose_teams>
     </cup_round>
   </cup_rounds>