diff --git a/tournaments/models/team_registration.py b/tournaments/models/team_registration.py
index 846b593..3adf067 100644
--- a/tournaments/models/team_registration.py
+++ b/tournaments/models/team_registration.py
@@ -38,21 +38,28 @@ class TeamRegistration(models.Model):
         return self.player_names()
 
     def player_names_as_list(self):
-        return [pr.name() for pr in self.playerregistration_set.all()]
-
+        players = list(self.playerregistration_set.all())
+        if len(players) == 0:
+            return ['', '']
+        elif len(players) == 1:
+            return [players[0].name(), '']
+        else:
+            return [pr.name() for pr in players]
 
     def team_names(self):
         if self.name:
-            return [self.name]
+            return [self.name, ''] #add an empty line if it's a team name
         else:
             return self.player_names_as_list()
 
     def shortened_team_names(self):
         if self.name:
-            return [self.name]
+            return [self.name, ''] #add an empty line if it's a team name
         else:
             players = list(self.playerregistration_set.all())
-            if len(players) == 1:
+            if len(players) == 0:
+                return ['', '']
+            elif len(players) == 1:
                 return [players[0].shortened_name(), '']
             else:
                 return [pr.shortened_name() for pr in players]
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 3740561..28ee3b8 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -722,6 +722,10 @@ class Tournament(models.Model):
         matches = [m for m in self.all_matches(False) if m.start_date and m.end_date is None]
         # print(f'first_unfinished_match > match len: {len(matches)}')
         matches.sort(key=lambda m: m.start_date)
+        main_bracket_matches = [m for m in matches if m.round and m.round.parent is None]
+        if main_bracket_matches:
+            return main_bracket_matches[0]
+
         if matches:
             return matches[0]
         else: