diff --git a/src/solo_turnier/batch.py b/src/solo_turnier/batch.py
index 428bc73..a2142d2 100644
--- a/src/solo_turnier/batch.py
+++ b/src/solo_turnier/batch.py
@@ -11,7 +11,7 @@ class BatchWorker:
         self.l = logging.getLogger("solo_turnier.batch")
         self.config = config
 
-    def run(self, removeFilteredParicipants=True):
+    def run(self, removeFilteredParicipants=True) -> solo_turnier.types.Stage5:
         self.l.debug(self.config.__dict__)
 
         locator = solo_turnier.html_locator.HtmlLocator()
diff --git a/src/solo_turnier/group.py b/src/solo_turnier/group.py
index 830b3ba..165b1a3 100644
--- a/src/solo_turnier/group.py
+++ b/src/solo_turnier/group.py
@@ -104,4 +104,6 @@ class GroupParser:
         ]
 
     def getGroupsAsSortedList(self, groups) -> list[Group]:
-        return [x for x in self.getGroups() if x in groups]
+        mainGroups = [x for x in self.getGroups() if x in groups]
+        additionalGroups = set(groups).difference(mainGroups)
+        return mainGroups + list(additionalGroups)
diff --git a/src/solo_turnier/static/style.css b/src/solo_turnier/static/style.css
index 5158548..1320070 100644
--- a/src/solo_turnier/static/style.css
+++ b/src/solo_turnier/static/style.css
@@ -22,6 +22,12 @@
     color: gray;
 }
 
+.tab-summary .no-finalist-dance {
+    color: gray;
+    text-decoration-style: solid;
+    text-decoration-line: line-through;
+}
+
 @media print {
     @page {
         size: landscape;
diff --git a/src/solo_turnier/templates/index.html b/src/solo_turnier/templates/index.html
index a62df9a..6927f0c 100644
--- a/src/solo_turnier/templates/index.html
+++ b/src/solo_turnier/templates/index.html
@@ -10,7 +10,7 @@
   </head>
   <body> 
     {# <h1>Finalauswertung Solo-Turniere</h1> #}
-    {% for group in data.groups %}
+    {% for group in data.resultsPerGroup %}
     {% block groupBlk scoped %}
     <div class="section">
         {% if group is none %}
@@ -21,11 +21,11 @@
         <table class="tab-summary">
             <tr>
                 <th>Teilnehmer</th>
-                {% for dance in data.results[group].dances %}
+                {% for dance in data.resultsPerGroup[group].dances %}
                 <th>{{ dance }}</th>
                 {% endfor %}
             </tr>
-            {% set activeGroup = data.results[group].results %}
+            {% set activeGroup = data.resultsPerGroup[group].resultsInGroup %}
             {% for participant, results in activeGroup|dictsort() %}
             {% block participantGrp scoped %}
             {% set rowCls = "" %}
@@ -35,16 +35,17 @@
             {% if participant.finalist or not onlyFinalists %}
             <tr class="{{ rowCls }}">
                 <td>{{ participant.name }} ({{ participant.id }})</td>
-                {% for dance in data.results[group].dances %}
+                {% for dance in data.resultsPerGroup[group].dances %}
                 {% block danceResult scoped %}
                 {% set res = activeGroup[participant][loop.index0] %}
                 <td>
                     {% if res is not none %}
                     {% if not participant.finalist %}
-                    Kein/e Finalist/in
+                    Kein/e Finalist/in <br />
                     {% endif %}
-                    {{ res.getNativePlace() }}
-                    ({{ res.nativeClass }}) <br />
+                    <span class="{% if not res.finalist %}no-finalist-dance{% endif %}">
+                      {{ res.getNativePlace() }} ({{ res.nativeClass }}) <br />
+                    </span>
                     <span class="competition-place">
                         {{ res.place }} in {{ res.competitionClass }}
                     </span>
