diff --git a/support_files/definitions/europe/cup_europe_champ_league.xml b/support_files/definitions/europe/cup_europe_champ_league.xml
index 7d36468d..8ecd88d1 100644
--- a/support_files/definitions/europe/cup_europe_champ_league.xml
+++ b/support_files/definitions/europe/cup_europe_champ_league.xml
@@ -31,6 +31,8 @@
 	<choose_team>
 	  <choose_team_sid>england1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>6</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -38,6 +40,8 @@
 	<choose_team>
 	  <choose_team_sid>france1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>5</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -45,6 +49,8 @@
 	<choose_team>
 	  <choose_team_sid>germany1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>6</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -59,12 +65,14 @@
 	<choose_team>
 	  <choose_team_sid>italy1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>5</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>netherlands1_short</choose_team_sid>
+	  <choose_team_sid>netherlands1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -87,6 +95,8 @@
 	<choose_team>
 	  <choose_team_sid>scotland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>3</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -94,6 +104,8 @@
 	<choose_team>
 	  <choose_team_sid>spain1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>5</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
diff --git a/support_files/definitions/europe/cup_europe_cwc.xml b/support_files/definitions/europe/cup_europe_cwc.xml
index eb25d884..285e2f11 100644
--- a/support_files/definitions/europe/cup_europe_cwc.xml
+++ b/support_files/definitions/europe/cup_europe_cwc.xml
@@ -30,6 +30,8 @@
 	<choose_team>
 	  <choose_team_sid>england1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>6</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -37,6 +39,8 @@
 	<choose_team>
 	  <choose_team_sid>france1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>5</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -44,6 +48,8 @@
 	<choose_team>
 	  <choose_team_sid>germany1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>6</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -58,12 +64,14 @@
 	<choose_team>
 	  <choose_team_sid>italy1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>5</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>netherlands1_short</choose_team_sid>
+	  <choose_team_sid>netherlands1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
@@ -86,6 +94,8 @@
 	<choose_team>
 	  <choose_team_sid>scotland1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>3</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
@@ -93,6 +103,8 @@
 	<choose_team>
 	  <choose_team_sid>spain1</choose_team_sid>
 	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>5</end_idx>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
 	</choose_team>
diff --git a/support_files/definitions/europe/cup_europe_uefa.xml b/support_files/definitions/europe/cup_europe_uefa.xml
index 38597e5d..753177ce 100644
--- a/support_files/definitions/europe/cup_europe_uefa.xml
+++ b/support_files/definitions/europe/cup_europe_uefa.xml
@@ -27,11 +27,7 @@
 	</choose_team>
 
 	<choose_team>
-	  <choose_team_sid>england1 france1 germany1 greece1_short
-	    italy1 netherlands1_short portugal1_short russia1_short
-	    scotland1 spain1 switzerland1_short turkey1_short
-	    ukraine1_short belgium1 czech1_short
-	    denmark1_short</choose_team_sid>
+	  <choose_team_sid>belgium1 england1 france1 germany1 italy1 scotland1 spain1 greece1_short netherlands1 portugal1_short russia1_short switzerland1_short turkey1_short ukraine1_short czech1_short denmark1_short</choose_team_sid>
 	  <number_of_teams>29</number_of_teams>
 	  <randomly>1</randomly>
 	  <generate>1</generate>
diff --git a/support_files/definitions/short_leagues/league_netherlands1_short.xml b/support_files/definitions/short_leagues/league_netherlands1_short.xml
deleted file mode 100644
index e2a07ade..00000000
--- a/support_files/definitions/short_leagues/league_netherlands1_short.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<league>
-
-<sid>netherlands1_short</sid>
-<symbol>flag_nl.png</symbol>
-	    
-<teams>
-<team>
-<team_name>F. Rotterdam</team_name>
-</team>
-<team>
-<team_name>Eindhoven</team_name>
-</team>
-<team>
-<team_name>Kerkrade</team_name>
-</team>
-<team>
-<team_name>Amsterdam</team_name>
-</team>
-<team>
-<team_name>Enschede</team_name>
-</team>
-<team>
-<team_name>Utrecht</team_name>
-</team>
-</teams>
-</league>