diff --git a/templates/_wagons.html.ep b/templates/_wagons.html.ep
new file mode 100644
index 0000000..8918273
--- /dev/null
+++ b/templates/_wagons.html.ep
@@ -0,0 +1,16 @@
+% for my $wagongroup (@{$wagongroups // []}) {
+	Wagenverbund <%= $wagongroup->{name} %> von <b><%= $wagongroup->{from} %></b> nach <b><%= $wagongroup->{to} %></b> als <b><%= $journey->{type} %> <%= $wagongroup->{no} %></b><br/>
+	% for my $wagon (@{$wagongroup->{wagons}}) {
+		% if (length($wagon->{id}) == 12) {
+			<span><%= substr($wagon->{id}, 0, 2) %></span><span><%= substr($wagon->{id}, 2, 2) %></span><span><%= substr($wagon->{id}, 4, 1) %></span><span class="wagonclass"><%= substr($wagon->{id}, 5, 3) %></span><span class="wagonnum"><%= substr($wagon->{id}, 8, 3) %></span><span class="checksum"><%= substr($wagon->{id}, 11) %></span>
+		% }
+		% elsif ($wagon->{id}) {
+			„<%= $wagon->{id} %>“
+		% }
+		%= $wagon->{type}
+		% if ($wagon->{number}) {
+			– Wagen <%= $wagon->{number} %>
+		% }
+		<br/>
+	% }
+% }
diff --git a/templates/journey.html.ep b/templates/journey.html.ep
index 396bc4e..74ad962 100644
--- a/templates/journey.html.ep
+++ b/templates/journey.html.ep
@@ -192,17 +192,7 @@
 				<tr>
 					<th scope="row">Rollmaterial</th>
 					<td class="wagons">
-						% for my $wagongroup (@{$journey->{user_data}{wagongroups} // []}) {
-							Wagenverbund <%= $wagongroup->{name} %> von <%= $wagongroup->{from} %> nach <%= $wagongroup->{to} %> als <%= $journey->{type} %> <%= $wagongroup->{no} %><br/>
-							% for my $wagon (@{$wagongroup->{wagons}}) {
-								<span><%= substr($wagon->{id}, 0, 2) %></span><span><%= substr($wagon->{id}, 2, 2) %></span><span><%= substr($wagon->{id}, 4, 1) %></span><span class="wagonclass"><%= substr($wagon->{id}, 5, 3) %></span><span class="wagonnum"><%= substr($wagon->{id}, 8, 3) %></span><span class="checksum"><%= substr($wagon->{id}, 11) %></span>
-								%= $wagon->{type}
-								% if ($wagon->{number}) {
-									– Wagen <%= $wagon->{number} %>
-								% }
-								<br/>
-							% }
-						% }
+						%= include '_wagons', wagongroups => $journey->{user_data}{wagongroups};
 					</td>
 				</tr>
 				% }