diff --git a/src/features/flights-map/components/FlightsMapStartPage.tsx b/src/features/flights-map/components/FlightsMapStartPage.tsx
index 03e068c9..422c6d66 100644
--- a/src/features/flights-map/components/FlightsMapStartPage.tsx
+++ b/src/features/flights-map/components/FlightsMapStartPage.tsx
@@ -243,7 +243,10 @@ export const FlightsMapStartPage: FC<FlightsMapStartPageProps> = ({
           id: city.code,
           lat: city.location.lat,
           lng: city.location.lon,
-          label: city.name,
+          // TZ §4.1.24.3 R24: hover tooltip shows the IATA airport code, not
+          // the city name. The city code doubles as IATA here since our
+          // dictionaries use IATA city codes (MOW, LED, …).
+          label: city.code,
           tooltipPermanent: true,
           style: isHighlighted ? "orange" : "blue-small",
           zoomLevel: getCityZoomLevel(city.code),
@@ -294,8 +297,9 @@ export const FlightsMapStartPage: FC<FlightsMapStartPageProps> = ({
     const arrCity = dictionaries.cityByCode.get(arrCityCode);
     if (!depCity || !arrCity) return [];
 
-    const date = filterState.date ?? todayYyyymmdd();
-    const buyUrl = buildBuyTicketUrl(depCityCode, arrCityCode, date);
+    // TZ §4.1.24.6: When no date is set, SB transition must be performed
+    // without a date. Pass filterState.date directly (may be undefined).
+    const buyUrl = buildBuyTicketUrl(depCityCode, arrCityCode, filterState.date);
 
     const depHtml = `
     <div class="popup-header-test"><span>${escapeHtml(depCity.name)}</span></div>