diff --git a/templates/_checked_in.html.ep b/templates/_checked_in.html.ep
index 797ff57ae34757a456f5a2e7859560e738a316dc..a5611e953186aa9d440a066811566c3343b24ed1 100644
--- a/templates/_checked_in.html.ep
+++ b/templates/_checked_in.html.ep
@@ -356,24 +356,20 @@
 				% }
 			</div>
 			<div class="card-action">
-				% my $url = 'https://bahn.expert/details/';
-				% if ($journey->{train_id} =~ m{[|]}) {
-					% if ($journey->{train_type} and $journey->{train_no}) {
-						% $url .= $journey->{train_type} . ' ' . $journey->{train_no};
-					% }
-					% $url .=  '/' . $journey->{sched_departure}->epoch . '000?jid=' . $journey->{train_id} =~ s{#}{%23}gr;
-				% }
-				% else {
-					% $url .= $journey->{train_type} . ' ' . $journey->{train_no} . '/' . $journey->{sched_departure}->epoch . '000?station=' . $journey->{dep_eva};
+				% my $url = 'https://dbf.finalrewind.org/z/';
+				% if ($journey->{is_hafas}) {
+					% $url .= $journey->{train_id} =~ s{#}{%23}gr . '?hafas=' . $journey->{backend_name};
+					<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Details</a>
 				% }
-				% if ($journey->{backend_id} <= 1) {
+				% elsif ($journey->{extra_data}{trip_id}) {
+					% $url .= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr;
 					<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left" aria-hidden="true">timeline</i> Zuglauf</a>
 				% }
 				% else {
 					&nbsp;
 				% }
 				% if ($journey->{extra_data}{trip_id}) {
-					<a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr %>/<%= $journey->{train_line} || 0 %>?hafas=<%= $journey->{backend_name} // 'DB' %>&amp;from=<%= $journey->{dep_name} %>&amp;to=<%= $journey->{arr_name} %>&amp;dark=<%= (session('theme') and session('theme') eq 'dark') ? 1 : 0 %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>
+					<a class="right" style="margin-right: 0;" href="https://dbf.finalrewind.org/map/<%= $journey->{extra_data}{trip_id} =~ s{#}{%23}gr %>/<%= $journey->{train_line} || 0 %>?hafas=<%= $journey->{backend_name} // 'VRN' %>&amp;from=<%= $journey->{dep_name} %>&amp;to=<%= $journey->{arr_name} %>"><i class="material-icons left" aria-hidden="true">map</i> Karte</a>
 				% }
 			</div>
 		</div>
diff --git a/templates/_public_status_card.html.ep b/templates/_public_status_card.html.ep
index 6dda46dd3df350f51349ba873783a228a250f63a..84708efb58b607f07a6a3e7477b4e15552cf22b1 100644
--- a/templates/_public_status_card.html.ep
+++ b/templates/_public_status_card.html.ep
@@ -168,8 +168,13 @@
 			<div class="card-action">
 				% if ($journey->{traewelling_url}) {
 					<a style="margin-right: 0;" href="<%= $journey->{traewelling_url} %>"><i class="material-icons left">timeline</i> Träwelling</a>
-				% } elsif ($journey->{backend_id} <= 1) {
-					% my $url = 'https://bahn.expert/details/' . $journey->{train_type} . ' ' . $journey->{train_no} . '/' . DateTime->now(time_zone => 'Europe/Berlin')->epoch . '000';
+				% }
+				% elsif ($journey->{is_hafas}) {
+					% my $url = 'https://dbf.finalrewind.org/z/' . $journey->{train_id} =~ s{#}{%23}gr . '?hafas=' . $journey->{backend_name};
+					<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left">timeline</i> Details</a>
+				% }
+				% elsif ($journey->{extra_data}{trip_id}) {
+					% my $url = 'https://dbf.finalrewind.org/z/' . $journey->{extra_data}{trip_id} =~ s{#}{%23}gr;
 					<a style="margin-right: 0;" href="<%= $url %>"><i class="material-icons left">timeline</i> Zuglauf</a>
 				% }
 				% else {