diff --git a/templates/macros.html b/templates/macros.html
index 5bdadc5..ff49986 100644
--- a/templates/macros.html
+++ b/templates/macros.html
@@ -96,6 +96,10 @@
   </div>
 {% endmacro %}
 
+{% macro flightradar24_url(flight) -%}
+https://www.flightradar24.com/data/flights/{{ flight.airline_detail.iata | lower + flight.flight_number }}
+{%- endmacro %}
+
 {% macro flight_booking_row(booking, show_flags=True) %}
   <div class="grid-item">
     {% if g.user.is_authenticated %}
@@ -134,8 +138,8 @@
     <div class="grid-item">{{ item.duration }}</div>
     <div class="grid-item">{{ full_flight_number }}</div>
     <div class="grid-item">
-      <a href="https://www.flightradar24.com/data/flights/{{ full_flight_number | lower }}">flightradar24</a>
-      | <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number | replace("U2", "EZY") }}">FlightAware</a>
+      <a href="{{ flightradar24_url(item) }}">flightradar24</a>
+      | <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number }}">FlightAware</a>
       | <a href="{{ radarbox_url }}">radarbox</a>
     </div>
     <div class="grid-item text-end">
@@ -169,8 +173,8 @@
     {% endif %}
   </div>
   <div class="grid-item">
-    <a href="https://www.flightradar24.com/data/flights/{{ full_flight_number | lower }}">flightradar24</a>
-    | <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number | replace("U2", "EZY") }}">FlightAware</a>
+    <a href="{{ flightradar24_url(item) }}">flightradar24</a>
+    | <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number }}">FlightAware</a>
     | <a href="{{ radarbox_url }}">radarbox</a>
   </div>
   <div class="grid-item text-end">
@@ -402,21 +406,22 @@
               &ndash;
               {{ e.end_loc }} {{ flag(trip, e.end_country.flag) }}
               {% if e.element_type == "flight" %}
-                {% set full_flight_number = e.detail.airline_code + e.detail.flight_number %}
+                {% set flight = e.detail %}
+                {% set full_flight_number = flight.airline_code + flight.flight_number %}
                 {% set radarbox_url = "https://www.radarbox.com/data/flights/" + full_flight_number %}
-                <span class="text-nowrap"><strong>airline:</strong> {{ e.detail.airline_name }}</span>
+                <span class="text-nowrap"><strong>airline:</strong> {{ flight.airline_name }}</span>
                 <span class="text-nowrap"><strong>flight number:</strong> {{ full_flight_number }}</span>
-                {% if e.detail.duration %}
-                  <span class="text-nowrap"><strong>duration:</strong> {{ e.detail.duration }}</span>
+                {% if flight.duration %}
+                  <span class="text-nowrap"><strong>duration:</strong> {{ flight.duration }}</span>
                 {% endif %}
-                {# <pre>{{ e.detail | pprint }}</pre> #}
-      <span class="text-nowrap"><strong>CO₂:</strong> {{ "{:,.1f}".format(e.detail.co2_kg) }} kg</span>
+                {# <pre>{{ flight | pprint }}</pre> #}
+                <span class="text-nowrap"><strong>CO₂:</strong> {{ "{:,.1f}".format(flight.co2_kg) }} kg</span>
               {% endif %}
               {% if e.detail.distance %}
                 <span class="text-nowrap"><strong>distance:</strong> {{ format_distance(e.detail.distance) }}</span>
               {% endif %}
               {% if e.element_type == "flight" %}
-                <a href="https://www.flightradar24.com/data/flights/{{ full_flight_number | lower }}">flightradar24</a>
+                <a href="{{ flightradar24_url(flight) }}">flightradar24</a>
                 | <a href="https://uk.flightaware.com/live/flight/{{ full_flight_number }}">FlightAware</a>
                 | <a href="{{ radarbox_url }}">radarbox</a>
               {% endif %}