diff --git a/templates/ergo.final.html.tera b/templates/ergo.final.html.tera
index a996e15..4e54637 100644
--- a/templates/ergo.final.html.tera
+++ b/templates/ergo.final.html.tera
@@ -12,8 +12,9 @@
 		<details>
 		  <summary>Dirty Thirty</summary>
 		  <p>
-			<div class="border-r border-l">{% for stat in thirty %}{{ stat.name }}&#9;{{ stat.dob }}&#9;{{ stat.weight }}&#9;{{ stat.sex }}&#9;&#9;Donau Linz&#9;{{ stat.result }}
-				{% endfor %}
+			<div class="border-r border-l">
+{% for stat in thirty %}{% set names = stat.name | split(pat=" ") %}{% set lastname_index = names | length - 1 %}{% set lastname = names[lastname_index] %}{{ lastname }}&#9;{% for name in names %}{% if loop.index != lastname_index +1 %}{{ name }} {% endif %}{% endfor %}&#9;{{ stat.dob }}&#9;{{ stat.weight }}&#9;{{ stat.sex }}&#9;&#9;DLI&#9;{{ stat.result }}
+{% endfor %}
 			</div>
 		  </p>
 		</details>
@@ -21,8 +22,12 @@
 		<details>
 		  <summary>Dirty Dozen</summary>
 		  <p>
-			<div class="border-r border-l">{% for stat in dozen %}{{ stat.name }}&#9;{{ stat.dob }}&#9;{{ stat.weight }}&#9;{{ stat.sex }}&#9;&#9;Donau Linz&#9;{{ stat.result }}
-				{% endfor %}
+			<div class="border-r border-l">{% for stat in dozen %}
+  {% set names = stat.name | split(pat=" ") %}
+  {% set lastname_index = names | length - 1 %}
+  {% set lastname = names[lastname_index] %}
+  {{ lastname }};{% for name in names %}{% if loop.index != lastname_index +1 %}{{ name }} {% endif %}{% endfor %};{{ stat.dob }};{{ stat.weight }};{{ stat.sex }};DLI;{{ stat.result }}<br />
+			{% endfor %}
 			</div>
 		  </p>
 		</details>