diff --git a/app.py b/app.py
index 5ae8691..1527c00 100644
--- a/app.py
+++ b/app.py
@@ -25,6 +25,7 @@ import scraper.eurostar as eurostar_scraper
 import scraper.gwr_fares as gwr_fares_scraper
 import scraper.realtime_trains as rtt_scraper
 from trip_planner import (
+    INBOUND_MAX_CONNECTION_MINUTES,
     INBOUND_MIN_CONNECTION_MINUTES,
     combine_inbound_trips,
     combine_trips,
@@ -34,8 +35,6 @@ from trip_planner import (
 import cache
 import circle_line
 
-CONNECTION_WINDOW_MINUTES = 90
-
 RTT_PADDINGTON_URL = (
     "https://www.realtimetrains.co.uk/search/detailed/"
     "gb-nr:PAD/from/gb-nr:{crs}/{date}/0000-2359"
@@ -89,31 +88,47 @@ DESTINATION_OPTIONS = [
     {"slug": "cologne", "city": "Cologne", "destination": "Cologne Hbf"},
 ]
 
-DESTINATIONS = {option["slug"]: option["destination"] for option in DESTINATION_OPTIONS}
+DESTINATIONS = {
+    option["slug"]: option["destination"] for option in DESTINATION_OPTIONS
+}
 
 
 @app.route("/")
 def index() -> ResponseReturnValue:
     today = date.today().isoformat()
-    default_min = _get_default_min_connection()
+    default_min, default_max = _get_defaults()
     return render_template(
         "index.html",
         destination_options=DESTINATION_OPTIONS,
         today=today,
         stations=STATIONS,
         default_min_connection=default_min,
+        default_max_connection=default_max,
         valid_min_connections=sorted(VALID_MIN_CONNECTIONS),
-        default_inbound_min_connection=INBOUND_MIN_CONNECTION_MINUTES,
-        valid_inbound_min_connections=sorted(VALID_INBOUND_MIN_CONNECTIONS),
-        valid_inbound_return_min_connections=sorted(
-            VALID_INBOUND_RETURN_MIN_CONNECTIONS
-        ),
+        valid_max_connections=sorted(VALID_MAX_CONNECTIONS),
+        default_return_date=(date.today() + timedelta(days=7)).isoformat(),
     )
 
 
 VALID_MIN_CONNECTIONS = {45, 50, 60, 70, 80, 90, 100, 110, 120}
+VALID_MAX_CONNECTIONS = {60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180}
 VALID_INBOUND_MIN_CONNECTIONS = {20, 30, 40, 45, 50, 60, 70, 80, 90, 100, 110, 120}
 VALID_INBOUND_RETURN_MIN_CONNECTIONS = {30, 40, 50, 60}
+VALID_INBOUND_MAX_CONNECTIONS = {
+    60,
+    70,
+    80,
+    90,
+    100,
+    110,
+    120,
+    130,
+    140,
+    150,
+    160,
+    170,
+    180,
+}
 VALID_JOURNEY_TYPES = {"outbound", "inbound", "return"}
 VALID_NR_CLASSES = {"walkon", "advance_std", "advance_1st"}
 VALID_ES_CLASSES = {"standard", "plus"}
@@ -269,12 +284,11 @@ def _eurostar_price_status(price: Any, seats: Any) -> str | None:
     return "price_not_returned"
 
 
-def _get_default_min_connection() -> int:
-    return app.config["DEFAULT_MIN_CONNECTION"]
-
-
-def _max_connection_for(min_connection: int) -> int:
-    return min_connection + CONNECTION_WINDOW_MINUTES
+def _get_defaults() -> tuple[int, int]:
+    return (
+        app.config["DEFAULT_MIN_CONNECTION"],
+        app.config["DEFAULT_MAX_CONNECTION"],
+    )
 
 
 def _parse_connection(raw: str | None, default: int, valid_set: set[int]) -> int:
@@ -375,15 +389,9 @@ def _results_url(
             **params,
         )
     if journey_type == "inbound":
-        return url_for(
-            "back_results",
-            station_crs=station_crs,
-            slug=slug,
-            travel_date=travel_date,
-            **params,
-        )
+        params["journey_type"] = "inbound"
     return url_for(
-        "out_results",
+        "results",
         station_crs=station_crs,
         slug=slug,
         travel_date=travel_date,
@@ -403,21 +411,22 @@ def search() -> ResponseReturnValue:
     if station_crs not in STATION_BY_CRS:
         station_crs = "BRI"
     if journey_type == "inbound":
-        default_min = INBOUND_MIN_CONNECTION_MINUTES
-        valid_min = VALID_INBOUND_MIN_CONNECTIONS
+        default_min, default_max = (
+            INBOUND_MIN_CONNECTION_MINUTES,
+            INBOUND_MAX_CONNECTION_MINUTES,
+        )
+        valid_min, valid_max = (
+            VALID_INBOUND_MIN_CONNECTIONS,
+            VALID_INBOUND_MAX_CONNECTIONS,
+        )
     else:
-        default_min = _get_default_min_connection()
-        valid_min = VALID_MIN_CONNECTIONS
-    min_connection_arg = (
-        request.args.get("min_connection_back")
-        if journey_type == "inbound"
-        else request.args.get("min_connection")
+        default_min, default_max = _get_defaults()
+        valid_min, valid_max = VALID_MIN_CONNECTIONS, VALID_MAX_CONNECTIONS
+    min_conn = _parse_connection(
+        request.args.get("min_connection"), default_min, valid_min
     )
-    min_conn = _parse_connection(min_connection_arg, default_min, valid_min)
-    inbound_min_conn = _parse_connection(
-        request.args.get("min_connection_in"),
-        INBOUND_MIN_CONNECTION_MINUTES,
-        VALID_INBOUND_RETURN_MIN_CONNECTIONS,
+    max_conn = _parse_connection(
+        request.args.get("max_connection"), default_max, valid_max
     )
     nr_class = request.args.get("nr_class", DEFAULT_NR_CLASS)
     if nr_class not in VALID_NR_CLASSES:
@@ -446,12 +455,7 @@ def search() -> ResponseReturnValue:
                 journey_type=journey_type,
                 return_date=return_date if journey_type == "return" else None,
                 min_connection=None if min_conn == default_min else min_conn,
-                min_connection_in=(
-                    None
-                    if journey_type != "return"
-                    or inbound_min_conn == INBOUND_MIN_CONNECTION_MINUTES
-                    else inbound_min_conn
-                ),
+                max_connection=None if max_conn == default_max else max_conn,
                 nr_class=None if nr_class == DEFAULT_NR_CLASS else nr_class,
                 es_class=None if es_class == DEFAULT_ES_CLASS else es_class,
             )
@@ -459,17 +463,18 @@ def search() -> ResponseReturnValue:
     return redirect(url_for("index"))
 
 
-@app.route("/results/<station_crs>/<slug>/out/<travel_date>")
-def out_results(station_crs: str, slug: str, travel_date: str) -> ResponseReturnValue:
-    return _results(station_crs, slug, travel_date, "outbound", None)
+@app.route("/results/<station_crs>/<slug>/<travel_date>")
+def results(station_crs: str, slug: str, travel_date: str) -> ResponseReturnValue:
+    return _results(
+        station_crs,
+        slug,
+        travel_date,
+        request.args.get("journey_type", "outbound"),
+        request.args.get("return_date"),
+    )
 
 
-@app.route("/results/<station_crs>/<slug>/back/<travel_date>")
-def back_results(station_crs: str, slug: str, travel_date: str) -> ResponseReturnValue:
-    return _results(station_crs, slug, travel_date, "inbound", None)
-
-
-@app.route("/results/<station_crs>/<slug>/return/<travel_date>/<return_date>")
+@app.route("/results/<station_crs>/<slug>/<travel_date>/return/<return_date>")
 def return_results(
     station_crs: str, slug: str, travel_date: str, return_date: str
 ) -> ResponseReturnValue:
@@ -502,15 +507,23 @@ def _results(
             return redirect(url_for("index"))
 
     if journey_type == "inbound":
-        default_min = INBOUND_MIN_CONNECTION_MINUTES
-        valid_min = VALID_INBOUND_MIN_CONNECTIONS
+        default_min, default_max = (
+            INBOUND_MIN_CONNECTION_MINUTES,
+            INBOUND_MAX_CONNECTION_MINUTES,
+        )
+        valid_min, valid_max = (
+            VALID_INBOUND_MIN_CONNECTIONS,
+            VALID_INBOUND_MAX_CONNECTIONS,
+        )
     else:
-        default_min = _get_default_min_connection()
-        valid_min = VALID_MIN_CONNECTIONS
+        default_min, default_max = _get_defaults()
+        valid_min, valid_max = VALID_MIN_CONNECTIONS, VALID_MAX_CONNECTIONS
     min_connection = _parse_connection(
         request.args.get("min_connection"), default_min, valid_min
     )
-    max_connection = _max_connection_for(min_connection)
+    max_connection = _parse_connection(
+        request.args.get("max_connection"), default_max, valid_max
+    )
     nr_class = request.args.get("nr_class", DEFAULT_NR_CLASS)
     if nr_class not in VALID_NR_CLASSES:
         nr_class = DEFAULT_NR_CLASS
@@ -569,6 +582,7 @@ def _results(
             departure_station_name=departure_station_name,
             journey_type=journey_type,
             travel_date_display=travel_date_display,
+            return_date=return_date,
             return_date_display=return_date_display,
             stream_url=_results_url(
                 station_crs=station_crs,
@@ -665,7 +679,7 @@ def _results(
         section_max_connection = max_connection
         if journey_type == "return" and direction == "inbound":
             section_min_connection = inbound_min_connection
-            section_max_connection = _max_connection_for(inbound_min_connection)
+            section_max_connection = INBOUND_MAX_CONNECTION_MINUTES
         rtt_direction = (
             "to_paddington" if direction == "outbound" else "from_paddington"
         )
@@ -733,8 +747,6 @@ def _results(
         cached_walkon = (
             exact_walkon if exact_walkon is not None else get_cached(walkon_weekday_key)
         )
-        if isinstance(cached_walkon, dict):
-            gwr_fares = cached_walkon
 
         if direction == "outbound":
             trips = combine_trips(
@@ -882,6 +894,7 @@ def _results(
             rtt_station_url = RTT_STATION_URL.format(crs=station_crs, date=travel_date)
 
             url_min = None if min_connection == default_min else min_connection
+            url_max = None if max_connection == default_max else max_connection
             url_nr = None if nr_class == DEFAULT_NR_CLASS else nr_class
             url_es = None if es_class == DEFAULT_ES_CLASS else es_class
 
@@ -890,6 +903,7 @@ def _results(
                     "journey_type": journey_type,
                     "return_date": return_date,
                     "min_connection": url_min,
+                    "max_connection": url_max,
                     "min_connection_in": (
                         None
                         if inbound_min_connection == INBOUND_MIN_CONNECTION_MINUTES
@@ -913,6 +927,7 @@ def _results(
                     "journey_type": journey_type,
                     "return_date": return_date,
                     "min_connection": url_min,
+                    "max_connection": url_max,
                     "nr_class": url_nr,
                     "es_class": url_es,
                 }
@@ -985,7 +1000,7 @@ def _results(
                         "id": "inbound",
                         "direction": "inbound",
                         "min_connection": inbound_min_connection,
-                        "max_connection": _max_connection_for(inbound_min_connection),
+                        "max_connection": INBOUND_MAX_CONNECTION_MINUTES,
                     },
                 ]
                 shell_nr_classes = {"outbound": nr_class_out, "inbound": nr_class_in}
@@ -1012,6 +1027,8 @@ def _results(
                 journey_type=journey_type,
                 destination=destination,
                 departure_station_name=departure_station_name,
+                travel_date=travel_date,
+                return_date=return_date,
                 travel_date_display=travel_date_display,
                 return_date_display=return_date_display,
                 slug=slug,
@@ -1033,9 +1050,12 @@ def _results(
                 rtt_url=rtt_url,
                 rtt_station_url=rtt_station_url,
                 min_connection=min_connection,
+                max_connection=max_connection,
                 default_min_connection=default_min,
+                default_max_connection=default_max,
                 default_inbound_min_connection=INBOUND_MIN_CONNECTION_MINUTES,
                 valid_min_connections=sorted(valid_min),
+                valid_max_connections=sorted(valid_max),
                 inbound_min_connection=inbound_min_connection,
                 valid_inbound_return_min_connections=sorted(
                     VALID_INBOUND_RETURN_MIN_CONNECTIONS
@@ -1071,8 +1091,6 @@ def _results(
                     section=section,
                     destination=destination,
                     departure_station_name=departure_station_name,
-                    nr_classes=shell_nr_classes,
-                    es_classes=shell_es_classes,
                 )
                 yield f"data: {json.dumps({'type': 'section', 'id': section_id, 'html': section_html, 'trip_fares': _section_trip_fares(section), 'advance_fares': section['advance_fares'], 'walkon_cached_fares': section.get('cached_walkon_fares'), 'walkon_api_url': section['walkon_api_url'], 'advance_api_url': section['advance_api_url'], 'advance_stream_url': section['advance_stream_url']})}\n\n"
 
@@ -1090,7 +1108,7 @@ def _results(
                     station_crs=station_crs,
                     slug=slug,
                     travel_date=travel_date,
-                    path_journey_type="back" if journey_type == "inbound" else "out",
+                    journey_type=journey_type if journey_type == "inbound" else None,
                 )
 
             summary_html = _build_summary_html(
@@ -1163,6 +1181,7 @@ def _results(
     rtt_station_url = RTT_STATION_URL.format(crs=station_crs, date=travel_date)
 
     url_min = None if min_connection == default_min else min_connection
+    url_max = None if max_connection == default_max else max_connection
     url_nr = None if nr_class == DEFAULT_NR_CLASS else nr_class
     url_es = None if es_class == DEFAULT_ES_CLASS else es_class
     common_url_args: dict[str, Any]
@@ -1171,6 +1190,7 @@ def _results(
             "journey_type": journey_type,
             "return_date": return_date,
             "min_connection": url_min,
+            "max_connection": url_max,
             "min_connection_in": (
                 None
                 if inbound_min_connection == INBOUND_MIN_CONNECTION_MINUTES
@@ -1186,6 +1206,7 @@ def _results(
             "journey_type": journey_type,
             "return_date": return_date,
             "min_connection": url_min,
+            "max_connection": url_max,
             "nr_class": url_nr,
             "es_class": url_es,
         }
@@ -1310,16 +1331,25 @@ def _results(
             station_crs=station_crs,
             slug=slug,
             travel_date=travel_date,
-            path_journey_type="back" if journey_type == "inbound" else "out",
+            journey_type=journey_type if journey_type == "inbound" else None,
         )
 
     return render_template(
         "results.html",
         sections=sections,
+        trips=sections[0]["trips"] if sections else [],
+        result_rows=sections[0]["rows"] if sections else [],
+        unreachable_morning_services=[],
+        destinations=DESTINATIONS,
         destination=destination,
+        travel_date=travel_date,
+        return_date=return_date,
         journey_type=journey_type,
         slug=slug,
+        station_crs=station_crs,
         departure_station_name=departure_station_name,
+        prev_date=prev_date,
+        next_date=next_date,
         prev_results_url=prev_results_url,
         next_results_url=next_results_url,
         prev_outbound_url=prev_outbound_url,
@@ -1340,7 +1370,15 @@ def _results(
         rtt_url=rtt_url,
         rtt_station_url=rtt_station_url,
         min_connection=min_connection,
+        max_connection=max_connection,
         default_min_connection=default_min,
+        default_max_connection=default_max,
+        url_min_connection=url_min,
+        url_max_connection=url_max,
+        nr_class=nr_class,
+        es_class=es_class,
+        url_nr_class=url_nr,
+        url_es_class=url_es,
         nr_classes=nr_classes,
         es_classes=es_classes,
         nr_classes_json=json.dumps(nr_classes),
@@ -1353,7 +1391,14 @@ def _results(
         advance_api_urls_json=json.dumps(advance_api_urls),
         advance_stream_urls_json=json.dumps(advance_stream_urls),
         timetable_refresh_url=timetable_refresh_url,
+        advance_fares_api_url=url_for(
+            "api_advance_fares", station_crs=station_crs, travel_date=travel_date
+        ),
+        advance_fares_stream_url=url_for(
+            "api_advance_fares_stream", station_crs=station_crs, travel_date=travel_date
+        ),
         valid_min_connections=sorted(valid_min),
+        valid_max_connections=sorted(valid_max),
         inbound_min_connection=inbound_min_connection,
         default_inbound_min_connection=INBOUND_MIN_CONNECTION_MINUTES,
         valid_inbound_return_min_connections=sorted(
@@ -1435,20 +1480,15 @@ def api_walkon_fares(
         return jsonify({"error": str(e)}), 500
 
 
-@app.route(
-    "/api/results_refresh/<station_crs>/<slug>/<path_journey_type>/<travel_date>"
-)
-def api_results_refresh(
-    station_crs: str, slug: str, path_journey_type: str, travel_date: str
-) -> Response:
-    if path_journey_type not in {"out", "back"}:
-        abort(404)
-    journey_type = "inbound" if path_journey_type == "back" else "outbound"
-    return _api_results_refresh(station_crs, slug, travel_date, None, journey_type)
+@app.route("/api/results_refresh/<station_crs>/<slug>/<travel_date>")
+def api_results_refresh(station_crs: str, slug: str, travel_date: str) -> Response:
+    return _api_results_refresh(
+        station_crs, slug, travel_date, request.args.get("return_date")
+    )
 
 
 @app.route(
-    "/api/results_refresh/<station_crs>/<slug>/return/<travel_date>/<return_date>"
+    "/api/results_refresh/<station_crs>/<slug>/<travel_date>/return/<return_date>"
 )
 def api_return_results_refresh(
     station_crs: str, slug: str, travel_date: str, return_date: str
diff --git a/config/default.py b/config/default.py
index c249656..3d9c4e2 100644
--- a/config/default.py
+++ b/config/default.py
@@ -11,3 +11,4 @@ CIRCLE_LINE_XML = os.path.join(TFL_DATA_DIR, "output_txc_01CIR_.xml")
 
 # Default connection window (minutes) between Paddington arrival and St Pancras departure
 DEFAULT_MIN_CONNECTION = 70
+DEFAULT_MAX_CONNECTION = 150
diff --git a/templates/base.html b/templates/base.html
index 4afdefd..5aeafa9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -342,7 +342,7 @@
     tr.row-selectable:hover:not(.row-selected) { filter: brightness(0.97); }
 
     /* Journey flow arrow between column headers */
-    .results-table thead th.flow-step { position: sticky; padding-right: 1.4rem; }
+    .results-table thead th.flow-step { position: relative; padding-right: 1.4rem; }
     .results-table thead th.flow-step::after {
       content: '›';
       position: absolute; right: 0.2rem; top: 50%; transform: translateY(-50%);
diff --git a/templates/index.html b/templates/index.html
index a3e495c..8d29dfe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
 <style>
-  .form-row[hidden] { display: none !important; }
-
   /* ── Calendar ───────────────────────────────────────────────────── */
   .cal-wrap { margin-top: .5rem; }
 
@@ -129,10 +127,10 @@
       <input type="hidden" id="return_date"  name="">
     </div>
 
-    <div class="form-row" id="outbound-connection-fields">
+    <div class="form-row">
       <div class="form-group">
         <label for="min_connection" class="field-label">
-          Minimum outbound connection (Paddington &rarr; St&nbsp;Pancras)
+          Minimum connection time (Paddington &rarr; St&nbsp;Pancras)
         </label>
         <select id="min_connection" name="min_connection" class="form-control">
           {% for mins in valid_min_connections %}
@@ -140,29 +138,14 @@
           {% endfor %}
         </select>
       </div>
-    </div>
 
-    <div class="form-row" id="back-connection-fields" hidden>
       <div class="form-group">
-        <label for="min_connection_back" class="field-label">
-          Minimum back connection (St&nbsp;Pancras &rarr; Paddington)
+        <label for="max_connection" class="field-label">
+          Maximum connection time (Paddington &rarr; St&nbsp;Pancras)
         </label>
-        <select id="min_connection_back" class="form-control" disabled>
-          {% for mins in valid_inbound_min_connections %}
-            <option value="{{ mins }}" {% if mins == default_inbound_min_connection %}selected{% endif %}>{{ mins }} min</option>
-          {% endfor %}
-        </select>
-      </div>
-    </div>
-
-    <div class="form-row" id="return-connection-fields" hidden>
-      <div class="form-group">
-        <label for="min_connection_in" class="field-label">
-          Minimum return-leg connection (St&nbsp;Pancras &rarr; Paddington)
-        </label>
-        <select id="min_connection_in" class="form-control" disabled>
-          {% for mins in valid_inbound_return_min_connections %}
-            <option value="{{ mins }}" {% if mins == default_inbound_min_connection %}selected{% endif %}>{{ mins }} min</option>
+        <select id="max_connection" name="max_connection" class="form-control">
+          {% for mins in valid_max_connections %}
+            <option value="{{ mins }}" {% if mins == default_max_connection %}selected{% endif %}>{{ mins }} min</option>
           {% endfor %}
         </select>
       </div>
@@ -224,28 +207,6 @@
       }
     }
 
-    function setConnectionSelect(id, enabled, name) {
-      var el = document.getElementById(id);
-      if (!el) return;
-      el.disabled = !enabled;
-      el.name = enabled ? name : '';
-    }
-
-    function syncConnectionFields() {
-      var selected = document.querySelector('input[name="journey_type"]:checked');
-      var journeyType = selected ? selected.value : 'outbound';
-      var isBack = journeyType === 'inbound';
-      var isRet = journeyType === 'return';
-
-      document.getElementById('outbound-connection-fields').hidden = isBack;
-      document.getElementById('back-connection-fields').hidden = !isBack;
-      document.getElementById('return-connection-fields').hidden = !isRet;
-
-      setConnectionSelect('min_connection', !isBack, 'min_connection');
-      setConnectionSelect('min_connection_back', isBack, 'min_connection_back');
-      setConnectionSelect('min_connection_in', isRet, 'min_connection_in');
-    }
-
     /* ── day click ───────────────────────────────────────────────────── */
 
     function onDayClick(d) {
@@ -487,7 +448,6 @@
           retPhase = false;
         }
         syncInputs();
-        syncConnectionFields();
         render();
       });
     });
@@ -515,7 +475,6 @@
     retPhase = isReturn && outDate !== null;
 
     syncInputs();
-    syncConnectionFields();
     render();
   }());
   </script>
diff --git a/templates/results.html b/templates/results.html
index cf07d6a..7f3da71 100644
--- a/templates/results.html
+++ b/templates/results.html
@@ -57,47 +57,38 @@
       {% endfor %}
     </div>
   </div>
-  {% set connection_direction = 'St Pancras → Paddington' if journey_type == 'inbound' else 'Paddington → St Pancras' %}
-  {% if journey_type != 'return' %}
   <div class="filter-row">
     <div>
-      <label for="min_conn_select" class="filter-label">Min connection ({{ connection_direction }}):</label>
+      <label for="min_conn_select" class="filter-label">Min connection:</label>
       <select id="min_conn_select" onchange="applyConnectionFilter()" class="select-inline">
         {% for mins in valid_min_connections %}
           <option value="{{ mins }}" {% if mins == min_connection %}selected{% endif %}>{{ mins }} min</option>
         {% endfor %}
       </select>
     </div>
+    <div>
+      <label for="max_conn_select" class="filter-label">Max connection:</label>
+      <select id="max_conn_select" onchange="applyConnectionFilter()" class="select-inline">
+        {% for mins in valid_max_connections %}
+          <option value="{{ mins }}" {% if mins == max_connection %}selected{% endif %}>{{ mins }} min</option>
+        {% endfor %}
+      </select>
+    </div>
   </div>
-  {% endif %}
   {% if journey_type == 'return' %}
     {% for section in sections %}
-    <div class="filter-row" style="margin-top:0.5rem;gap:0.75rem">
+    <div class="filter-row" style="margin-top:0.5rem">
       <span class="filter-label" style="min-width:5.5rem">{{ 'Outbound' if section.direction == 'outbound' else 'Return' }}:</span>
+      {% if section.direction == 'inbound' %}
       <div>
-        <span class="filter-label">ES:</span>
-        <div class="btn-group">
-          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'standard' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="standard" onclick="setEsClass('standard', '{{ section.id }}')">Standard</button>
-          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'plus' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="plus" onclick="setEsClass('plus', '{{ section.id }}')">Standard Premier</button>
-        </div>
-      </div>
-      <div>
-        {% if section.direction == 'inbound' %}
-          <label for="min_conn_in_select" class="filter-label">Min connection:</label>
-          <select id="min_conn_in_select" onchange="applyConnectionFilter()" class="select-inline">
-            {% for mins in valid_inbound_return_min_connections %}
-              <option value="{{ mins }}" {% if mins == inbound_min_connection %}selected{% endif %}>{{ mins }} min</option>
-            {% endfor %}
-          </select>
-        {% else %}
-          <label for="min_conn_select" class="filter-label">Min connection:</label>
-          <select id="min_conn_select" onchange="applyConnectionFilter()" class="select-inline">
-            {% for mins in valid_min_connections %}
-              <option value="{{ mins }}" {% if mins == min_connection %}selected{% endif %}>{{ mins }} min</option>
-            {% endfor %}
-          </select>
-        {% endif %}
+        <label for="min_conn_in_select" class="filter-label">Min connection:</label>
+        <select id="min_conn_in_select" onchange="applyConnectionFilter()" class="select-inline">
+          {% for mins in valid_inbound_return_min_connections %}
+            <option value="{{ mins }}" {% if mins == inbound_min_connection %}selected{% endif %}>{{ mins }} min</option>
+          {% endfor %}
+        </select>
       </div>
+      {% endif %}
       <div>
         <span class="filter-label">NR:</span>
         <div class="btn-group">
@@ -106,6 +97,13 @@
           <button type="button" class="btn-group-option {% if nr_classes[section.id] == 'advance_1st' %}active{% endif %}" data-section="{{ section.id }}" data-nr-class="advance_1st" onclick="setNrClass('advance_1st', '{{ section.id }}')">Advance 1st</button>
         </div>
       </div>
+      <div>
+        <span class="filter-label">Eurostar:</span>
+        <div class="btn-group">
+          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'standard' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="standard" onclick="setEsClass('standard', '{{ section.id }}')">Standard</button>
+          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'plus' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="plus" onclick="setEsClass('plus', '{{ section.id }}')">Standard Premier</button>
+        </div>
+      </div>
     </div>
     {% endfor %}
     <div style="font-size:0.82rem;color:#718096;margin-top:0.4rem">
@@ -128,7 +126,7 @@
         <span id="advance-loading" style="display:none"><span class="spinner spinner-inline" aria-hidden="true"></span>Loading advance fares</span>
       </div>
       <div>
-        <span class="filter-label">ES:</span>
+        <span class="filter-label">Eurostar:</span>
         <span id="es-type-select" style="display:none"></span>
         <div class="btn-group">
           <button type="button" class="btn-group-option {% if es_classes[section.id] == 'standard' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="standard" onclick="setEsClass('standard', '{{ section.id }}')">Standard</button>
@@ -138,25 +136,26 @@
     </div>
   {% endif %}
   <script>
-    var RESULTS_BASE = '{{ results_base_url }}';
-    var DEFAULT_MIN_CONN = {{ default_min_connection }};
-    var DEFAULT_MIN_CONN_IN = {{ default_inbound_min_connection }};
-    var TRIP_FARES = {{ trip_fares_json | safe }};
-    var ADVANCE_FARES = {{ advance_fares_json | safe }};
-    var WALKON_CACHED_FARES = {{ walkon_cached_fares_json | safe }};
-    var WALKON_API_URLS = {{ walkon_api_urls_json | safe }};
-    var ADVANCE_API_URLS = {{ advance_api_urls_json | safe }};
-    var ADVANCE_STREAM_URLS = {{ advance_stream_urls_json | safe }};
-    var TIMETABLE_REFRESH_URL = {{ timetable_refresh_url|tojson }};
-    var HAS_PROVISIONAL_TIMETABLE = {{ 'true' if provisional_timetable else 'false' }};
-    var eurostarRefreshPending = HAS_PROVISIONAL_TIMETABLE && !!TIMETABLE_REFRESH_URL && !!window.EventSource;
-    var cachedAdvanceFares = ADVANCE_FARES;
-    var currentNrClasses = {{ nr_classes_json | safe }};
-    var currentEsClasses = {{ es_classes_json | safe }};
-    var SECTION_DIRECTIONS = {{ section_directions_json | safe }};
-    var advanceLoadingSections = {};
-    var walkonLoadingSections = {};
-    var selectedRowKeys = {};
+    const RESULTS_BASE = '{{ results_base_url }}';
+    const DEFAULT_MIN_CONN = {{ default_min_connection }};
+    const DEFAULT_MAX_CONN = {{ default_max_connection }};
+    const DEFAULT_MIN_CONN_IN = {{ default_inbound_min_connection }};
+    let TRIP_FARES = {{ trip_fares_json | safe }};
+    let ADVANCE_FARES = {{ advance_fares_json | safe }};
+    const WALKON_CACHED_FARES = {{ walkon_cached_fares_json | safe }};
+    let WALKON_API_URLS = {{ walkon_api_urls_json | safe }};
+    let ADVANCE_API_URLS = {{ advance_api_urls_json | safe }};
+    let ADVANCE_STREAM_URLS = {{ advance_stream_urls_json | safe }};
+    const TIMETABLE_REFRESH_URL = {{ timetable_refresh_url|tojson }};
+    const HAS_PROVISIONAL_TIMETABLE = {{ 'true' if provisional_timetable else 'false' }};
+    let eurostarRefreshPending = HAS_PROVISIONAL_TIMETABLE && !!TIMETABLE_REFRESH_URL && !!window.EventSource;
+    let cachedAdvanceFares = ADVANCE_FARES;
+    let currentNrClasses = {{ nr_classes_json | safe }};
+    let currentEsClasses = {{ es_classes_json | safe }};
+    const SECTION_DIRECTIONS = {{ section_directions_json | safe }};
+    let advanceLoadingSections = {};
+    let walkonLoadingSections = {};
+    let selectedRowKeys = {};
 
     function updateAdvanceLoadingStatus() {
       var loading = Object.keys(advanceLoadingSections).some(function(sectionId) {
@@ -168,8 +167,10 @@
 
     function buildUrl() {
       var min = parseInt(document.getElementById('min_conn_select').value);
+      var max = parseInt(document.getElementById('max_conn_select').value);
       var params = [];
       if (min !== DEFAULT_MIN_CONN) params.push('min_connection=' + min);
+      if (max !== DEFAULT_MAX_CONN) params.push('max_connection=' + max);
       var minInEl = document.getElementById('min_conn_in_select');
       if (minInEl) {
         var minIn = parseInt(minInEl.value);
@@ -259,19 +260,10 @@
         for (var rowKey in TRIP_FARES) {
           var row = TRIP_FARES[rowKey];
           if (rowKey !== key && row.eurostar_key !== key) continue;
-          var price = prices[key];
-          if (price.es_standard) {
-            row.es_standard = price.es_standard;
-            row.es_standard_status = price.es_standard_status;
-          } else if (!row.es_standard && price.es_standard_status !== undefined) {
-            row.es_standard_status = price.es_standard_status;
-          }
-          if (price.es_plus) {
-            row.es_plus = price.es_plus;
-            row.es_plus_status = price.es_plus_status;
-          } else if (!row.es_plus && price.es_plus_status !== undefined) {
-            row.es_plus_status = price.es_plus_status;
-          }
+          if (prices[key].es_standard) row.es_standard = prices[key].es_standard;
+          if (prices[key].es_standard_status !== undefined) row.es_standard_status = prices[key].es_standard_status;
+          if (prices[key].es_plus) row.es_plus = prices[key].es_plus;
+          if (prices[key].es_plus_status !== undefined) row.es_plus_status = prices[key].es_plus_status;
         }
       }
     }
@@ -458,7 +450,7 @@
             totalSpan.innerHTML = '';
           } else if (!nrFare) {
             totalSpan.innerHTML = '<span class="text-xs text-muted" title="National Rail fare data is not available for this service">NR fare not available</span>';
-          } else if (eurostarRefreshPending && !row.es_standard_status && !row.es_plus_status) {
+          } else if (eurostarRefreshPending) {
             totalSpan.innerHTML = '<span class="text-xs text-muted" title="Checking exact Eurostar data for this service">Checking Eurostar price</span>';
           } else {
             totalSpan.innerHTML = '<span class="text-xs text-muted" title="' + eurostarMissingTitle(row, esClass) + ' Check eurostar.com.">' + eurostarMissingText(row, esClass) + '</span>';
diff --git a/templates/results_section.html b/templates/results_section.html
index bbb7381..be0782b 100644
--- a/templates/results_section.html
+++ b/templates/results_section.html
@@ -81,7 +81,7 @@
                   {% if row.headcode or row.arrive_platform %}
                     <br><span class="text-xs text-muted mobile-hide">{{ row.headcode }}{% if row.headcode and row.arrive_platform %} &middot; {% endif %}{% if row.arrive_platform %}Plat {{ row.arrive_platform }}{% endif %}</span>
                   {% endif %}
-                  <span class="fare-line nr-walkon">{% if row.ticket_price is not none %}<span class="text-sm font-bold">£{{ "%.2f"|format(row.ticket_price) }}</span>{% if row.ticket_name %} <span class="text-xs text-muted">{{ row.ticket_name }}</span>{% endif %}{% endif %}</span>
+                  <span class="fare-line nr-walkon">{% if row.ticket_price is not none %}<span class="text-sm font-bold">£{{ "%.2f"|format(row.ticket_price) }}</span>{% endif %}</span>
                   <span class="fare-line nr-advance-std"></span>
                   <span class="fare-line nr-advance-1st"></span>
                 </td>
@@ -92,7 +92,7 @@
                   {% if row.headcode or row.arrive_platform %}
                     <br><span class="text-xs text-muted mobile-hide">{{ row.headcode }}{% if row.headcode and row.arrive_platform %} &middot; {% endif %}{% if row.arrive_platform %}Plat {{ row.arrive_platform }}{% endif %}</span>
                   {% endif %}
-                  <span class="fare-line nr-walkon">{% if row.ticket_price is not none %}<span class="text-sm font-bold">£{{ "%.2f"|format(row.ticket_price) }}</span>{% if row.ticket_name %} <span class="text-xs text-muted">{{ row.ticket_name }}</span>{% endif %}{% endif %}</span>
+                  <span class="fare-line nr-walkon">{% if row.ticket_price is not none %}<span class="text-sm font-bold">£{{ "%.2f"|format(row.ticket_price) }}</span>{% endif %}</span>
                   <span class="fare-line nr-advance-std"></span>
                   <span class="fare-line nr-advance-1st"></span>
                   <span class="text-xs text-muted mobile-conn">then {{ row.connection_duration }} to Eurostar{% if row.connection_minutes < 80 %} ⚠️{% endif %}</span>
@@ -129,16 +129,7 @@
                 {% else %}
                   <span class="text-blue">{{ row.total_duration }}</span>
                 {% endif %}
-                {% set nr_class = nr_classes.get(section.id, 'walkon') %}
-                {% set es_class = es_classes.get(section.id, 'standard') %}
-                {% set circle_fare = (row.circle_services[0].fare if row.circle_services else 0) %}
-                {% set selected_es_price = row.eurostar_plus_price if es_class == 'plus' else row.eurostar_price %}
-                {% if nr_class == 'walkon' and row.ticket_price is not none and selected_es_price is not none %}
-                  {% set initial_total = row.ticket_price + selected_es_price + circle_fare %}
-                  <br><span class="total-price"><span class="text-sm text-green" style="font-weight:700">£{{ "%.2f"|format(initial_total) }}</span></span>
-                {% else %}
-                  <br><span class="total-price"></span>
-                {% endif %}
+                <br><span class="total-price"></span>
               </td>
             {% else %}
               <td>
diff --git a/templates/results_shell.html b/templates/results_shell.html
index 016b7a0..b3715c1 100644
--- a/templates/results_shell.html
+++ b/templates/results_shell.html
@@ -57,47 +57,38 @@
       {% endfor %}
     </div>
   </div>
-  {% set connection_direction = 'St Pancras → Paddington' if journey_type == 'inbound' else 'Paddington → St Pancras' %}
-  {% if journey_type != 'return' %}
   <div class="filter-row">
     <div>
-      <label for="min_conn_select" class="filter-label">Min connection ({{ connection_direction }}):</label>
+      <label for="min_conn_select" class="filter-label">Min connection:</label>
       <select id="min_conn_select" onchange="applyConnectionFilter()" class="select-inline">
         {% for mins in valid_min_connections %}
           <option value="{{ mins }}" {% if mins == min_connection %}selected{% endif %}>{{ mins }} min</option>
         {% endfor %}
       </select>
     </div>
+    <div>
+      <label for="max_conn_select" class="filter-label">Max connection:</label>
+      <select id="max_conn_select" onchange="applyConnectionFilter()" class="select-inline">
+        {% for mins in valid_max_connections %}
+          <option value="{{ mins }}" {% if mins == max_connection %}selected{% endif %}>{{ mins }} min</option>
+        {% endfor %}
+      </select>
+    </div>
   </div>
-  {% endif %}
   {% if journey_type == 'return' %}
     {% for section in sections %}
-    <div class="filter-row" style="margin-top:0.5rem;gap:0.75rem">
+    <div class="filter-row" style="margin-top:0.5rem">
       <span class="filter-label" style="min-width:5.5rem">{{ 'Outbound' if section.direction == 'outbound' else 'Return' }}:</span>
+      {% if section.direction == 'inbound' %}
       <div>
-        <span class="filter-label">ES:</span>
-        <div class="btn-group">
-          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'standard' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="standard" onclick="setEsClass('standard', '{{ section.id }}')">Standard</button>
-          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'plus' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="plus" onclick="setEsClass('plus', '{{ section.id }}')">Standard Premier</button>
-        </div>
-      </div>
-      <div>
-        {% if section.direction == 'inbound' %}
-          <label for="min_conn_in_select" class="filter-label">Min connection:</label>
-          <select id="min_conn_in_select" onchange="applyConnectionFilter()" class="select-inline">
-            {% for mins in valid_inbound_return_min_connections %}
-              <option value="{{ mins }}" {% if mins == inbound_min_connection %}selected{% endif %}>{{ mins }} min</option>
-            {% endfor %}
-          </select>
-        {% else %}
-          <label for="min_conn_select" class="filter-label">Min connection:</label>
-          <select id="min_conn_select" onchange="applyConnectionFilter()" class="select-inline">
-            {% for mins in valid_min_connections %}
-              <option value="{{ mins }}" {% if mins == min_connection %}selected{% endif %}>{{ mins }} min</option>
-            {% endfor %}
-          </select>
-        {% endif %}
+        <label for="min_conn_in_select" class="filter-label">Min connection:</label>
+        <select id="min_conn_in_select" onchange="applyConnectionFilter()" class="select-inline">
+          {% for mins in valid_inbound_return_min_connections %}
+            <option value="{{ mins }}" {% if mins == inbound_min_connection %}selected{% endif %}>{{ mins }} min</option>
+          {% endfor %}
+        </select>
       </div>
+      {% endif %}
       <div>
         <span class="filter-label">NR:</span>
         <div class="btn-group">
@@ -106,6 +97,13 @@
           <button type="button" class="btn-group-option {% if nr_classes[section.id] == 'advance_1st' %}active{% endif %}" data-section="{{ section.id }}" data-nr-class="advance_1st" onclick="setNrClass('advance_1st', '{{ section.id }}')">Advance 1st</button>
         </div>
       </div>
+      <div>
+        <span class="filter-label">Eurostar:</span>
+        <div class="btn-group">
+          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'standard' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="standard" onclick="setEsClass('standard', '{{ section.id }}')">Standard</button>
+          <button type="button" class="btn-group-option {% if es_classes[section.id] == 'plus' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="plus" onclick="setEsClass('plus', '{{ section.id }}')">Standard Premier</button>
+        </div>
+      </div>
     </div>
     {% endfor %}
     <div style="font-size:0.82rem;color:#718096;margin-top:0.4rem">
@@ -128,7 +126,7 @@
         <span id="advance-loading" style="display:none"><span class="spinner spinner-inline" aria-hidden="true"></span>Loading advance fares</span>
       </div>
       <div>
-        <span class="filter-label">ES:</span>
+        <span class="filter-label">Eurostar:</span>
         <span id="es-type-select" style="display:none"></span>
         <div class="btn-group">
           <button type="button" class="btn-group-option {% if es_classes[section.id] == 'standard' %}active{% endif %}" data-section="{{ section.id }}" data-es-class="standard" onclick="setEsClass('standard', '{{ section.id }}')">Standard</button>
@@ -138,25 +136,26 @@
     </div>
   {% endif %}
   <script>
-    var RESULTS_BASE = '{{ results_base_url }}';
-    var DEFAULT_MIN_CONN = {{ default_min_connection }};
-    var DEFAULT_MIN_CONN_IN = {{ default_inbound_min_connection }};
-    var TRIP_FARES = {};
-    var ADVANCE_FARES = null;
-    var WALKON_CACHED_FARES = {};
-    var WALKON_API_URLS = {};
-    var ADVANCE_API_URLS = {};
-    var ADVANCE_STREAM_URLS = {};
-    var TIMETABLE_REFRESH_URL = null;
-    var HAS_PROVISIONAL_TIMETABLE = false;
-    var eurostarRefreshPending = false;
-    var cachedAdvanceFares = null;
-    var currentNrClasses = {{ nr_classes_json | safe }};
-    var currentEsClasses = {{ es_classes_json | safe }};
-    var SECTION_DIRECTIONS = {{ section_directions_json | safe }};
-    var advanceLoadingSections = {};
-    var walkonLoadingSections = {};
-    var selectedRowKeys = {};
+    const RESULTS_BASE = '{{ results_base_url }}';
+    const DEFAULT_MIN_CONN = {{ default_min_connection }};
+    const DEFAULT_MAX_CONN = {{ default_max_connection }};
+    const DEFAULT_MIN_CONN_IN = {{ default_inbound_min_connection }};
+    let TRIP_FARES = {};
+    let ADVANCE_FARES = null;
+    let WALKON_CACHED_FARES = {};
+    let WALKON_API_URLS = {};
+    let ADVANCE_API_URLS = {};
+    let ADVANCE_STREAM_URLS = {};
+    let TIMETABLE_REFRESH_URL = null;
+    let HAS_PROVISIONAL_TIMETABLE = false;
+    let eurostarRefreshPending = false;
+    let cachedAdvanceFares = null;
+    let currentNrClasses = {{ nr_classes_json | safe }};
+    let currentEsClasses = {{ es_classes_json | safe }};
+    const SECTION_DIRECTIONS = {{ section_directions_json | safe }};
+    let advanceLoadingSections = {};
+    let walkonLoadingSections = {};
+    let selectedRowKeys = {};
 
     function updateAdvanceLoadingStatus() {
       var loading = Object.keys(advanceLoadingSections).some(function(sectionId) {
@@ -168,8 +167,10 @@
 
     function buildUrl() {
       var min = parseInt(document.getElementById('min_conn_select').value);
+      var max = parseInt(document.getElementById('max_conn_select').value);
       var params = [];
       if (min !== DEFAULT_MIN_CONN) params.push('min_connection=' + min);
+      if (max !== DEFAULT_MAX_CONN) params.push('max_connection=' + max);
       var minInEl = document.getElementById('min_conn_in_select');
       if (minInEl) {
         var minIn = parseInt(minInEl.value);
@@ -259,19 +260,10 @@
         for (var rowKey in TRIP_FARES) {
           var row = TRIP_FARES[rowKey];
           if (rowKey !== key && row.eurostar_key !== key) continue;
-          var price = prices[key];
-          if (price.es_standard) {
-            row.es_standard = price.es_standard;
-            row.es_standard_status = price.es_standard_status;
-          } else if (!row.es_standard && price.es_standard_status !== undefined) {
-            row.es_standard_status = price.es_standard_status;
-          }
-          if (price.es_plus) {
-            row.es_plus = price.es_plus;
-            row.es_plus_status = price.es_plus_status;
-          } else if (!row.es_plus && price.es_plus_status !== undefined) {
-            row.es_plus_status = price.es_plus_status;
-          }
+          if (prices[key].es_standard) row.es_standard = prices[key].es_standard;
+          if (prices[key].es_standard_status !== undefined) row.es_standard_status = prices[key].es_standard_status;
+          if (prices[key].es_plus) row.es_plus = prices[key].es_plus;
+          if (prices[key].es_plus_status !== undefined) row.es_plus_status = prices[key].es_plus_status;
         }
       }
     }
@@ -458,7 +450,7 @@
             totalSpan.innerHTML = '';
           } else if (!nrFare) {
             totalSpan.innerHTML = '<span class="text-xs text-muted" title="National Rail fare data is not available for this service">NR fare not available</span>';
-          } else if (eurostarRefreshPending && !row.es_standard_status && !row.es_plus_status) {
+          } else if (eurostarRefreshPending) {
             totalSpan.innerHTML = '<span class="text-xs text-muted" title="Checking exact Eurostar data for this service">Checking Eurostar price</span>';
           } else {
             totalSpan.innerHTML = '<span class="text-xs text-muted" title="' + eurostarMissingTitle(row, esClass) + ' Check eurostar.com.">' + eurostarMissingText(row, esClass) + '</span>';
diff --git a/tests/test_app.py b/tests/test_app.py
index 1ca43ab..b484e8b 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -73,12 +73,12 @@ def test_search_redirects_to_results_with_selected_params() -> None:
     client = _client()
 
     resp = client.get(
-        "/search?destination=rotterdam&travel_date=2026-04-10&min_connection=60&station_crs=BRI"
+        "/search?destination=rotterdam&travel_date=2026-04-10&min_connection=60&max_connection=120&station_crs=BRI"
     )
 
     assert resp.status_code == 302
     assert resp.headers["Location"].endswith(
-        "/results/BRI/rotterdam/out/2026-04-10?min_connection=60"
+        "/results/BRI/rotterdam/2026-04-10?min_connection=60&max_connection=120"
     )
 
 
@@ -91,47 +91,7 @@ def test_search_redirects_return_with_return_date() -> None:
 
     assert resp.status_code == 302
     assert resp.headers["Location"].endswith(
-        "/results/BRI/paris/return/2026-04-10/2026-04-17"
-    )
-
-
-def test_search_redirects_inbound_to_back_path() -> None:
-    client = _client()
-
-    resp = client.get(
-        "/search?journey_type=inbound&destination=paris&travel_date=2026-04-10&station_crs=BRI"
-    )
-
-    assert resp.status_code == 302
-    assert resp.headers["Location"].endswith("/results/BRI/paris/back/2026-04-10")
-
-
-def test_search_uses_back_connection_fields_for_inbound() -> None:
-    client = _client()
-
-    resp = client.get(
-        "/search?journey_type=inbound&destination=paris&travel_date=2026-04-10"
-        "&station_crs=BRI&min_connection=50"
-        "&min_connection_back=40"
-    )
-
-    assert resp.status_code == 302
-    assert resp.headers["Location"].endswith(
-        "/results/BRI/paris/back/2026-04-10?min_connection=40"
-    )
-
-
-def test_search_redirects_return_with_return_leg_connection() -> None:
-    client = _client()
-
-    resp = client.get(
-        "/search?journey_type=return&destination=paris&travel_date=2026-04-10"
-        "&return_date=2026-04-17&station_crs=BRI&min_connection_in=40"
-    )
-
-    assert resp.status_code == 302
-    assert resp.headers["Location"].endswith(
-        "/results/BRI/paris/return/2026-04-10/2026-04-17?min_connection_in=40"
+        "/results/BRI/paris/2026-04-10/return/2026-04-17"
     )
 
 
@@ -146,7 +106,7 @@ def test_results_shows_same_day_destination_switcher(monkeypatch: Any) -> None:
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -154,11 +114,11 @@ def test_results_shows_same_day_destination_switcher(monkeypatch: Any) -> None:
     assert "Switch destination for Friday 10 April 2026" in html
     assert '<span class="chip-current">Paris Gare du Nord</span>' in html
     assert (
-        "/results/BRI/brussels/out/2026-04-10?min_connection=60"
+        "/results/BRI/brussels/2026-04-10?min_connection=60&amp;max_connection=120"
         in html
     )
     assert (
-        "/results/BRI/rotterdam/out/2026-04-10?min_connection=60"
+        "/results/BRI/rotterdam/2026-04-10?min_connection=60&amp;max_connection=120"
         in html
     )
     assert "ES 9014" in html
@@ -184,13 +144,6 @@ def test_results_can_render_from_weekday_timetable_cache(monkeypatch: Any) -> No
                 "train_number": "ES 9014",
             },
         ],
-        app_module._walkon_weekday_cache_key("to_paddington", "BRI", travel_date): {
-            "07:00": {
-                "ticket": "Anytime Day Single",
-                "price": 138.70,
-                "code": "SDS",
-            },
-        },
     }
     monkeypatch.setattr(app_module, "get_cached", lambda key, ttl=None: cache.get(key))
     monkeypatch.setattr(app_module, "set_cached", lambda key, data: None)
@@ -218,7 +171,7 @@ def test_results_can_render_from_weekday_timetable_cache(monkeypatch: Any) -> No
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-06-22?min_connection=60"
+        "/results/BRI/paris/2026-06-22?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -226,10 +179,8 @@ def test_results_can_render_from_weekday_timetable_cache(monkeypatch: Any) -> No
     assert "07:00 &rarr; 08:45" in html
     assert "10:01 &rarr; 13:34" in html
     assert "ES 9014" in html
-    assert "£138.70" in html
-    assert "Anytime Day Single" in html
     assert "checking exact timetable" in html
-    assert "/api/results_refresh/BRI/paris/out/2026-06-22" in html
+    assert "/api/results_refresh/BRI/paris/2026-06-22" in html
     assert "refreshFullResults()" in html
     assert "window.location.reload()" not in html
     assert "Checking Eurostar price" in html
@@ -317,7 +268,7 @@ def test_results_refresh_reloads_when_exact_timetable_differs(monkeypatch: Any)
     )
     client = _client()
 
-    resp = client.get("/api/results_refresh/BRI/paris/out/2026-06-22")
+    resp = client.get("/api/results_refresh/BRI/paris/2026-06-22")
     body = resp.get_data(as_text=True)
 
     assert resp.status_code == 200
@@ -390,7 +341,7 @@ def test_results_refresh_streams_prices_when_timetable_matches(
     )
     client = _client()
 
-    resp = client.get("/api/results_refresh/BRI/paris/out/2026-06-22")
+    resp = client.get("/api/results_refresh/BRI/paris/2026-06-22")
     body = resp.get_data(as_text=True)
 
     assert resp.status_code == 200
@@ -411,7 +362,7 @@ def test_results_progressive_shell_loads_without_scraping(monkeypatch: Any) -> N
     monkeypatch.setattr(gwr_fares_scraper, "fetch", fail_fetch)
     client = _client()
 
-    resp = client.get("/results/BRI/paris/out/2026-04-10?progressive=1")
+    resp = client.get("/results/BRI/paris/2026-04-10?progressive=1")
     html = resp.get_data(as_text=True)
 
     assert resp.status_code == 200
@@ -428,7 +379,7 @@ def test_return_progressive_shell_formats_return_date(monkeypatch: Any) -> None:
     monkeypatch.setattr(gwr_fares_scraper, "fetch", fail_fetch)
     client = _client()
 
-    resp = client.get("/results/BRI/paris/return/2026-04-10/2026-04-17?progressive=1")
+    resp = client.get("/results/BRI/paris/2026-04-10/return/2026-04-17?progressive=1")
     html = resp.get_data(as_text=True)
 
     assert resp.status_code == 200
@@ -441,7 +392,7 @@ def test_results_title_and_social_meta_include_destination(monkeypatch: Any) ->
     client = _client()
 
     resp = client.get(
-        "/results/BRI/lille/out/2026-04-10?min_connection=60"
+        "/results/BRI/lille/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -456,7 +407,7 @@ def test_results_title_and_social_meta_include_destination(monkeypatch: Any) ->
         'to Lille Europe on Friday 10 April 2026 via Paddington, St Pancras, and Eurostar.">'
     ) in html
     assert (
-        '<meta property="og:url" content="http://localhost/results/BRI/lille/out/2026-04-10?min_connection=60">'
+        '<meta property="og:url" content="http://localhost/results/BRI/lille/2026-04-10?min_connection=60&amp;max_connection=120">'
         in html
     )
 
@@ -547,7 +498,7 @@ def test_results_marks_trips_within_five_minutes_of_fastest_and_slowest(
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -616,7 +567,7 @@ def test_results_shows_only_pre_first_reachable_unreachable_services(
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -632,7 +583,7 @@ def test_results_shows_eurostar_price_and_total(monkeypatch: Any) -> None:
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -689,7 +640,7 @@ def test_results_uses_unique_row_keys_for_same_eurostar(monkeypatch: Any) -> Non
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -734,7 +685,7 @@ def test_results_shows_unreachable_service_when_no_trips(monkeypatch: Any) -> No
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -752,7 +703,7 @@ def test_results_shows_eurostar_plus_price(monkeypatch: Any) -> None:
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -767,7 +718,7 @@ def test_results_selectors_present(monkeypatch: Any) -> None:
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -824,7 +775,7 @@ def test_results_preloads_cached_advance_fares(monkeypatch: Any) -> None:
     client = _client()
 
     resp = client.get(
-        "/results/BRI/paris/out/2026-04-10?min_connection=60"
+        "/results/BRI/paris/2026-04-10?min_connection=60&max_connection=120"
     )
     html = resp.get_data(as_text=True)
 
@@ -876,7 +827,7 @@ def test_results_inbound_uses_reverse_legs(monkeypatch: Any) -> None:
     )
     client = _client()
 
-    resp = client.get("/results/BRI/paris/back/2026-04-10")
+    resp = client.get("/results/BRI/paris/2026-04-10?journey_type=inbound")
     html = resp.get_data(as_text=True)
 
     assert resp.status_code == 200
@@ -966,7 +917,7 @@ def test_results_return_renders_outbound_and_inbound_tables(monkeypatch: Any) ->
     )
     client = _client()
 
-    resp = client.get("/results/BRI/paris/return/2026-04-10/2026-04-17")
+    resp = client.get("/results/BRI/paris/2026-04-10/return/2026-04-17")
     html = resp.get_data(as_text=True)
 
     assert resp.status_code == 200
@@ -974,11 +925,11 @@ def test_results_return_renders_outbound_and_inbound_tables(monkeypatch: Any) ->
     assert "Return: Paris Gare du Nord &rarr; Bristol Temple Meads" in html
     assert "Friday 10 April 2026" in html
     assert "Friday 17 April 2026" in html
-    assert "/results/BRI/paris/return/2026-04-09/2026-04-17" in html
-    assert "/results/BRI/paris/return/2026-04-11/2026-04-17" in html
-    assert "/results/BRI/paris/return/2026-04-10/2026-04-16" in html
-    assert "/results/BRI/paris/return/2026-04-10/2026-04-18" in html
-    assert "/results/BRI/paris/return/2026-04-10/2026-04-17" in html
+    assert "/results/BRI/paris/2026-04-09/return/2026-04-17" in html
+    assert "/results/BRI/paris/2026-04-11/return/2026-04-17" in html
+    assert "/results/BRI/paris/2026-04-10/return/2026-04-16" in html
+    assert "/results/BRI/paris/2026-04-10/return/2026-04-18" in html
+    assert "/results/BRI/paris/2026-04-10/return/2026-04-17" in html
     assert "journey_type=return" not in html
     assert "return_date=2026-04-17" not in html
     assert "Circle 09:10 &rarr; KX 09:25" in html
diff --git a/tests/test_playwright_return_fares.py b/tests/test_playwright_return_fares.py
index 6eb6ad2..01205ff 100644
--- a/tests/test_playwright_return_fares.py
+++ b/tests/test_playwright_return_fares.py
@@ -239,78 +239,12 @@ def _launch_browser(playwright: Any) -> Any:
         pytest.skip(f"Chromium browser unavailable for Playwright: {exc}")
 
 
-def test_back_search_uses_back_connection_defaults(local_server: str) -> None:
-    with sync_playwright() as p:
-        browser = _launch_browser(p)
-        page = browser.new_page()
-        page.goto(f"{local_server}/", wait_until="domcontentloaded")
-
-        page.locator("#journey-inbound").check(force=True)
-        assert page.locator("#outbound-connection-fields").is_hidden()
-        assert page.locator("#back-connection-fields").is_visible()
-        assert page.locator("#min_connection_back").input_value() == "30"
-
-        page.locator("#cal-next").click()
-        page.get_by_role("button", name="10 June 2026").click()
-        page.locator('button[type="submit"]').click()
-        page.wait_for_url("**/results/BRI/paris/back/2026-06-10", timeout=10000)
-        assert "min_connection=50" not in page.url
-        browser.close()
-
-
-def test_progressive_results_do_not_redeclare_trip_fares(local_server: str) -> None:
-    with sync_playwright() as p:
-        browser = _launch_browser(p)
-        page = browser.new_page()
-        errors: list[str] = []
-        page.on("pageerror", lambda exc: errors.append(str(exc)))
-        page.on(
-            "console",
-            lambda msg: errors.append(msg.text) if msg.type == "error" else None,
-        )
-
-        page.goto(
-            f"{local_server}/results/BRI/brussels/return/2026-08-04/2026-08-11?progressive=1",
-            wait_until="domcontentloaded",
-        )
-        page.get_by_role(
-            "heading", name="Outbound: Bristol Temple Meads → Brussels Midi"
-        ).wait_for(timeout=10000)
-        page.get_by_role(
-            "heading", name="Return: Brussels Midi → Bristol Temple Meads"
-        ).wait_for(timeout=10000)
-
-        assert errors == []
-        assert "Could not load results" not in page.locator("body").inner_text()
-        browser.close()
-
-
-def test_all_return_table_headers_are_sticky(local_server: str) -> None:
-    with sync_playwright() as p:
-        browser = _launch_browser(p)
-        page = browser.new_page()
-        page.goto(
-            f"{local_server}/results/BRI/brussels/return/2026-08-04/2026-08-11",
-            wait_until="domcontentloaded",
-        )
-
-        tables = page.locator(".results-table")
-
-        assert tables.count() == 2
-        for index in range(2):
-            positions = tables.nth(index).locator("thead th").evaluate_all(
-                "(headers) => headers.map((header) => getComputedStyle(header).position)"
-            )
-            assert positions == ["sticky", "sticky", "sticky", "sticky"]
-        browser.close()
-
-
 def test_single_advance_standard_totals_after_click(single_server: str) -> None:
     with sync_playwright() as p:
         browser = _launch_browser(p)
         page = browser.new_page()
         page.goto(
-            f"{single_server}/results/BRI/paris/out/2026-07-20",
+            f"{single_server}/results/BRI/paris/2026-07-20",
             wait_until="domcontentloaded",
         )
 
@@ -327,81 +261,6 @@ def test_single_advance_standard_totals_after_click(single_server: str) -> None:
         browser.close()
 
 
-def test_gwr_fare_update_keeps_existing_eurostar_price(single_server: str) -> None:
-    with sync_playwright() as p:
-        browser = _launch_browser(p)
-        page = browser.new_page()
-        page.goto(
-            f"{single_server}/results/BRI/paris/out/2026-07-20",
-            wait_until="domcontentloaded",
-        )
-
-        page.evaluate(
-            """
-            () => {
-              eurostarRefreshPending = true;
-              mergeWalkonFares('main', {
-                '07:00': {
-                  price: 138.70,
-                  ticket: 'Anytime Day Single'
-                }
-              });
-              updateDisplay();
-            }
-            """
-        )
-
-        page.wait_for_function(
-            "Array.from(document.querySelectorAll('.total-price'))"
-            ".some(el => el.textContent.includes('£200.80'))",
-            timeout=10000,
-        )
-        assert "Checking Eurostar price" not in page.locator("body").inner_text()
-        browser.close()
-
-
-def test_eurostar_fare_update_uses_existing_gwr_price(single_server: str) -> None:
-    with sync_playwright() as p:
-        browser = _launch_browser(p)
-        page = browser.new_page()
-        page.goto(
-            f"{single_server}/results/BRI/paris/out/2026-07-20",
-            wait_until="domcontentloaded",
-        )
-
-        page.evaluate(
-            """
-            () => {
-              for (const key in TRIP_FARES) {
-                const row = TRIP_FARES[key];
-                row.walkon = {
-                  price: 138.70,
-                  ticket: 'Anytime Day Single'
-                };
-                row.es_standard = null;
-                row.es_standard_status = undefined;
-              }
-              eurostarRefreshPending = true;
-              updateDisplay();
-              mergeEurostarPrices({
-                'main:10:01': {
-                  es_standard: {price: 59, seats: 42},
-                  es_standard_status: null
-                }
-              });
-              updateDisplay();
-            }
-            """
-        )
-
-        page.wait_for_function(
-            "Array.from(document.querySelectorAll('.total-price'))"
-            ".some(el => el.textContent.includes('£200.80'))",
-            timeout=10000,
-        )
-        browser.close()
-
-
 def test_single_next_date_advance_standard_labels_unreachable_rows(
     monkeypatch: Any,
 ) -> None:
@@ -485,7 +344,7 @@ def test_single_next_date_advance_standard_labels_unreachable_rows(
             page = browser.new_page()
             page.goto(
                 f"http://127.0.0.1:{server.server_port}"
-                "/results/BRI/brussels/out/2026-06-16",
+                "/results/BRI/brussels/2026-06-16",
                 wait_until="domcontentloaded",
             )
             page.get_by_role("link", name="Next →").click()
@@ -513,7 +372,7 @@ def test_single_advance_standard_premier_totals_on_initial_url(
         browser = _launch_browser(p)
         page = browser.new_page()
         page.goto(
-            f"{single_server}/results/BRI/paris/out/2026-07-20"
+            f"{single_server}/results/BRI/paris/2026-07-20"
             "?nr_class=advance_std&es_class=plus",
             wait_until="domcontentloaded",
         )
@@ -593,7 +452,7 @@ def test_single_advance_first_falls_back_to_walkon_when_unavailable(
             page = browser.new_page()
             page.goto(
                 f"http://127.0.0.1:{server.server_port}"
-                "/results/BRI/paris/out/2026-07-20?nr_class=advance_1st&es_class=standard",
+                "/results/BRI/paris/2026-07-20?nr_class=advance_1st&es_class=standard",
                 wait_until="domcontentloaded",
             )
 
@@ -637,7 +496,7 @@ def test_return_advance_first_standard_premier_totals(local_server: str) -> None
             timeout=10000,
         )
 
-        assert "/results/BRI/paris/return/2026-07-20/2026-07-27" in page.url
+        assert "/results/BRI/paris/2026-07-20/return/2026-07-27" in page.url
         assert "journey_type=return" not in page.url
         assert "return_date=2026-07-27" not in page.url
         assert "nr_class=advance_1st" in page.url
@@ -669,7 +528,7 @@ def test_return_calendar_selects_outbound_before_return(local_server: str) -> No
         assert "Return: Wed 17 Jun" in page.locator("#cal-hint").inner_text()
 
         page.locator('button[type="submit"]').click()
-        page.wait_for_url("**/results/BRI/paris/return/2026-06-10/2026-06-17", timeout=10000)
+        page.wait_for_url("**/results/BRI/paris/2026-06-10/return/2026-06-17", timeout=10000)
         browser.close()
 
 
@@ -680,7 +539,7 @@ def test_return_advance_first_standard_premier_totals_on_initial_url(
         browser = _launch_browser(p)
         page = browser.new_page()
         page.goto(
-            f"{local_server}/results/BRI/paris/return/2026-07-20/2026-07-27"
+            f"{local_server}/results/BRI/paris/2026-07-20/return/2026-07-27"
             "?nr_class=advance_1st&es_class=plus",
             wait_until="domcontentloaded",
         )
diff --git a/tests/test_trip_planner.py b/tests/test_trip_planner.py
index 2348a81..91d8988 100644
--- a/tests/test_trip_planner.py
+++ b/tests/test_trip_planner.py
@@ -128,11 +128,11 @@ def test_max_connection_enforced() -> None:
 
 
 # ---------------------------------------------------------------------------
-# All valid Eurostars per National Rail departure
+# Only earliest valid Eurostar per GWR departure
 # ---------------------------------------------------------------------------
 
 
-def test_all_valid_eurostars_per_gwr() -> None:
+def test_only_earliest_eurostar_per_gwr() -> None:
     es1 = {
         "depart_st_pancras": "10:01",
         "arrive_destination": "13:34",
@@ -143,8 +143,9 @@ def test_all_valid_eurostars_per_gwr() -> None:
         "arrive_destination": "14:34",
         "destination": "Paris Gare du Nord",
     }
-    trips = combine_trips([GWR_FAST], [es1, es2], DATE, max_connection_minutes=140)
-    assert [t["depart_st_pancras"] for t in trips] == ["10:01", "11:01"]
+    trips = combine_trips([GWR_FAST], [es1, es2], DATE)
+    assert len(trips) == 1
+    assert trips[0]["depart_st_pancras"] == "10:01"
 
 
 # ---------------------------------------------------------------------------
@@ -294,27 +295,3 @@ def test_combine_inbound_trips_pairs_eurostar_to_paddington_departure() -> None:
     assert trips[0]["arrive_uk_station"] == "18:55"
     assert trips[0]["ticket_price"] == 63.60
     assert trips[0]["check_in_by"] == "14:42"
-
-
-def test_combine_inbound_trips_keeps_all_valid_paddington_departures() -> None:
-    eurostar = [
-        {
-            "depart_destination": "15:12",
-            "arrive_st_pancras": "16:30",
-            "destination": "Paris Gare du Nord",
-        }
-    ]
-    gwr = [
-        {"depart_paddington": "17:15", "arrive_destination": "18:55"},
-        {"depart_paddington": "17:45", "arrive_destination": "19:25"},
-    ]
-
-    trips = combine_inbound_trips(
-        eurostar,
-        gwr,
-        DATE,
-        min_connection_minutes=30,
-        max_connection_minutes=120,
-    )
-
-    assert [t["depart_paddington"] for t in trips] == ["17:15", "17:45"]
diff --git a/trip_planner.py b/trip_planner.py
index 102cdaa..155eda5 100644
--- a/trip_planner.py
+++ b/trip_planner.py
@@ -179,6 +179,7 @@ def combine_trips(
     trips = []
 
     for gwr in gwr_trains:
+        # Find only the earliest viable Eurostar for this GWR departure
         for es in eurostar_trains:
             connection = _is_viable_connection(
                 gwr,
@@ -222,6 +223,7 @@ def combine_trips(
                     "ticket_code": fare["code"] if fare else None,
                 }
             )
+            break  # Only the earliest valid Eurostar per GWR departure
 
     trips.sort(key=lambda t: (t["depart_bristol"], t["depart_st_pancras"]))
     return trips
@@ -287,6 +289,7 @@ def combine_inbound_trips(
                     "ticket_code": fare["code"] if fare else None,
                 }
             )
+            break
 
     trips.sort(key=lambda t: (t["depart_destination"], t["depart_paddington"]))
     return trips