diff --git a/tournaments/models/match.py b/tournaments/models/match.py
index cb42958..8a9123e 100644
--- a/tournaments/models/match.py
+++ b/tournaments/models/match.py
@@ -52,10 +52,10 @@ class Match(models.Model):
         items = []
         if self.round:
             items.append(self.round.name())
-            items.append(f" #{self.index}")
+            items.append(f" #{self.index_in_round() + 1}")
         elif self.group_stage:
             items.append(self.group_stage.name())
-            items.append(f"Match #{self.index}")
+            items.append(f"Match #{self.index + 1}")
         return " ".join(items)
 
     def summon_stage_name(self):
@@ -76,9 +76,116 @@ class Match(models.Model):
         else:
             return '--'
 
+    def get_previous_round(self):
+        # Calculate the next index
+        if self.round is None:
+            return None
+
+        previous_index = self.round.index + 1
+
+        # Check if the next index is within the bounds of the rounds array
+        if previous_index < len(self.round.tournament.round_set.all()):
+            return self.round.tournament.round_set.filter(index=previous_index, parent = None).first()
+
+        # Return None or an appropriate value if the index is out of bounds
+        return None
+
+    def precedent_match(self, top):
+        previous_round = self.get_previous_round()
+        #print(previous_round)
+        match = None
+        if previous_round:
+            matches = previous_round.match_set.all()  # Retrieve the QuerySet
+            match_index = self.index * 2 + 1
+            if top == False:
+                match_index += 1
+            match = matches.filter(index=match_index).first()
+        return match
+
+    def computed_name(self):
+        if self.round and self.round.parent is None:
+            return self.backup_name()
+        title = self.name if self.name else self.backup_name()
+        return title
+
+    def index_in_round(self):
+        if self.round is not None:
+            matches = sorted(
+                self.round.match_set.filter(disabled=False),
+                key=lambda match: match.index
+            )
+            try:
+                index_of_self = matches.index(self)
+                return index_of_self
+            except ValueError:
+                # `self` is not in `matches`, return self.index as a fallback
+                return self.index
+
+        return self.index
+
+
     def player_names(self):
         return map(lambda ts: ts.player_names(), self.team_scores.all())
 
+    def default_live_team(self, names):
+        image = None
+        weight= None
+        is_winner = False
+        scores = []
+        walk_out = None
+        team = Team(image, names, scores, weight, is_winner, walk_out)
+        return team
+
+    def live_teams(self):
+        #print('player names from match')
+        ##return map(lambda ts: ts.player_names(), self.team_scores.all())
+        # List to hold the names of the teams
+        teams = []
+
+        # Check if team scores exist
+        team_scores = list(self.team_scores.all())
+        previous_top_match = self.precedent_match(True)
+        previous_bottom_match = self.precedent_match(False)
+        if len(team_scores) == 0:
+            if (self.round and len(self.round.tournament.round_set.all()) == self.round.index -1):
+                return teams
+            if (self.group_stage):
+                return teams
+
+            if self.round and self.round.parent:
+                return teams
+
+            # No team scores at all
+            if previous_top_match:
+                names = [f"Gagnants du {previous_top_match.computed_name()}", '']
+                team = self.default_live_team(names)
+                teams.append(team)
+            if previous_bottom_match:
+                names = [f"Gagnants du {previous_bottom_match.computed_name()}", '']
+                team = self.default_live_team(names)
+                teams.append(team)
+        elif len(team_scores) == 1:
+            # Only one team score, handle missing one
+            existing_team = team_scores[0].live_team(self)
+
+            if previous_top_match and previous_top_match.disabled == False and previous_top_match.end_date is None:
+                names = [f"Gagnants du {previous_top_match.computed_name()}", '']
+                team = self.default_live_team(names)
+                teams.append(team)
+                teams.append(existing_team)
+            elif previous_bottom_match:
+                names = [f"Gagnants du {previous_bottom_match.computed_name()}", '']
+                team = self.default_live_team(names)
+                teams.append(existing_team)
+                teams.append(team)
+            else:
+                teams.append(existing_team)
+        else:
+            # Both team scores present
+            teams.extend([team_score.live_team(self) for team_score in team_scores])
+
+        return teams
+
     def local_start_date(self):
         timezone = self.tournament().timezone()
         return self.start_date.astimezone(timezone)
@@ -194,7 +301,7 @@ class Match(models.Model):
             # return f"{_hours:02d}h{_minutes:02d}min"
 
     def live_match(self):
-        title = self.name if self.name else self.backup_name()
+        title = self.computed_name()
         date = self.formatted_start_date()
         time_indication = self.time_indication()
         court = self.court_name(self.court_index)
@@ -205,19 +312,7 @@ class Match(models.Model):
         ended = self.end_date is not None
         livematch = LiveMatch(title, date, time_indication, court, self.started(), ended, group_stage_name)
 
-        for team_score in self.sorted_team_scores():
-            if team_score.team_registration:
-                image = team_score.team_registration.logo
-                weight = team_score.team_registration.weight
-                is_winner = team_score.team_registration.id == self.winning_team_id
-            else:
-                image = None
-                weight= None
-                is_winner = False
-            names = team_score.shortened_team_names()
-            scores = team_score.scores_array()
-            walk_out = team_score.walk_out
-            team = Team(image, names, scores, weight, is_winner, walk_out)
+        for team in self.live_teams():
             livematch.add_team(team)
 
         return livematch
diff --git a/tournaments/models/round.py b/tournaments/models/round.py
index 4f5a348..feca1d0 100644
--- a/tournaments/models/round.py
+++ b/tournaments/models/round.py
@@ -77,3 +77,10 @@ class Round(models.Model):
             return self
         else:
             return self.parent.root_round()
+
+    def all_matches_are_over(self):
+        for match in self.match_set.all():
+            if match.end_date is None and match.disabled is False:
+                return False
+
+        return True
diff --git a/tournaments/models/team_registration.py b/tournaments/models/team_registration.py
index 7736713..7f2b5d4 100644
--- a/tournaments/models/team_registration.py
+++ b/tournaments/models/team_registration.py
@@ -47,7 +47,11 @@ class TeamRegistration(models.Model):
         if self.name:
             return [self.name]
         else:
-            return [pr.shortened_name() for pr in self.playerregistration_set.all()]
+            players = list(self.playerregistration_set.all())
+            if len(players) == 1:
+                return [players[0].shortened_name(), '']
+            else:
+                return [pr.shortened_name() for pr in players]
 
     def player_names(self):
         names = [pr.name() for pr in self.playerregistration_set.all()]
diff --git a/tournaments/models/team_score.py b/tournaments/models/team_score.py
index 41852f0..3c510b2 100644
--- a/tournaments/models/team_score.py
+++ b/tournaments/models/team_score.py
@@ -56,12 +56,31 @@ class TeamScore(models.Model):
         games = 0.0
         if self.match.format:
             format = self.match.format
+        if format == FederalMatchCategory.TWO_SETS_OF_SUPER_TIE:
+            games = sum(scores) / 4
+            return games
         if FederalMatchCategory.last_set_is_tie_break(format) and len(scores) == FederalMatchCategory.max_number_of_sets(format):
             points = scores.pop()
-            games += points / 7 # we take 7 points in average for a game
+            games += points / 4 # we take 4 points in average for a game
         games += sum(scores)
         return games
 
     def number_of_games(self):
         scores = self.scores()
         return sum(scores)
+
+    def live_team(self, match):
+        if self.team_registration:
+            image = self.team_registration.logo
+            weight = self.team_registration.weight
+            is_winner = self.team_registration.id == match.winning_team_id
+        else:
+            image = None
+            weight= None
+            is_winner = False
+        names = self.shortened_team_names()
+        scores = self.scores_array()
+        walk_out = self.walk_out
+        from .match import Team  # Import Team only when needed
+        team = Team(image, names, scores, weight, is_winner, walk_out)
+        return team
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index 2fde8c6..5f78852 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -585,19 +585,23 @@ class Tournament(models.Model):
         else:
             current_round = self.round_to_show()
             if current_round:
+                all_upper_matches_are_over = current_round.all_matches_are_over()
+                if all_upper_matches_are_over is False:
+                    matches.extend(current_round.get_matches_recursive(True))
 
                 # Add full matches from the next rounds
                 next_round = self.round_for_index(current_round.index - 1)
                 if next_round:
                     matches.extend(next_round.get_matches_recursive(True))
 
+                if all_upper_matches_are_over is True:
+                    matches.extend(current_round.get_matches_recursive(True))
+
                 # Add matches from the previous round or group_stages
                 previous_round = self.round_for_index(current_round.index + 1)
                 if previous_round:
-                    matches.extend(current_round.get_matches_recursive(True))
                     matches.extend(previous_round.get_matches_recursive(True))
                 else:
-                    matches.extend(current_round.all_matches(True))
                     group_stages = [gs.live_group_stages() for gs in self.last_group_stage_step()]
 
         return matches, group_stages
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_match.html b/tournaments/templates/tournaments/broadcast/broadcasted_match.html
index 295b181..1878786 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_match.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_match.html
@@ -15,7 +15,7 @@
                 <div class="player bold">
                     <template x-for="name in match.teams[i-1].names">
                         <div :class="match.teams[i-1].is_winner ? 'winner' : ''">
-                            <span x-text="name"></span>
+                            <span x-text="name === '' ? '\u00A0' : name"></span>
                         </div>
                     </template>
                 </div>
diff --git a/tournaments/templates/tournaments/match_cell.html b/tournaments/templates/tournaments/match_cell.html
index 984bd81..cbed073 100644
--- a/tournaments/templates/tournaments/match_cell.html
+++ b/tournaments/templates/tournaments/match_cell.html
@@ -16,7 +16,11 @@
                     <div class="player">
                         {% for name in team.names %}
                         <div class="semibold {% if team.is_winner %}winner{% endif %}">
-                            {{ name }}
+                            {% if name|length > 0 %}
+                                {{ name }}
+                            {% else %}
+                                &nbsp;
+                            {% endif %}
                         </div>
                         {% endfor %}
                     </div>
@@ -31,7 +35,7 @@
                     <span class="score ws w60px">
                         {% if team.walk_out %}WO{% endif %}
                     </span>
-                    {% elif not tournament.hide_weight %}
+                    {% elif not tournament.hide_weight and team.weight %}
                         <span class="score ws numbers">{{ team.weight }}</span>
                     {% endif %}
                 </div>