diff --git a/assets/ts/schedule/components/ScheduleFinder.tsx b/assets/ts/schedule/components/ScheduleFinder.tsx
index 41f64731c4..c7d2efa777 100644
--- a/assets/ts/schedule/components/ScheduleFinder.tsx
+++ b/assets/ts/schedule/components/ScheduleFinder.tsx
@@ -1,5 +1,5 @@
 import React, { ReactElement } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import { useSelector } from "react-redux";
 import { Dispatch } from "redux";
 import { Route, DirectionId } from "../../__v3api";
 import {
@@ -44,43 +44,18 @@ const ScheduleFinder = ({
   scheduleNote,
   hasServiceToday
 }: Props): ReactElement<HTMLElement> => {
-  const dispatch = useDispatch();
   const { modalOpen, selectedOrigin } = useSelector(
     (state: StoreProps) => state
   );
 
   const currentDirection = useDirectionChangeEvent(directionId);
-  const openOriginModal = (): void => {
-    if (!modalOpen) {
-      dispatch({
-        type: "OPEN_MODAL",
-        newStoreValues: {
-          modalMode: "origin"
-        }
-      });
-    }
-  };
 
   const openScheduleModal = (): void => {
     if (selectedOrigin !== undefined && !modalOpen) {
-      dispatch({
-        type: "OPEN_MODAL",
-        newStoreValues: {
-          modalMode: "schedule"
-        }
-      });
+      document.location.href = `/departures/?route_id=${route.id}&direction_id=${directionId}&stop_id=${selectedOrigin}`;
     }
   };
 
-  const handleOriginSelectClick = (): void => {
-    dispatch({
-      type: "OPEN_MODAL",
-      newStoreValues: {
-        modalMode: "origin"
-      }
-    });
-  };
-
   const isFerryRoute = routeToModeName(route) === "ferry";
 
   return (
@@ -92,7 +67,6 @@ const ScheduleFinder = ({
       <ScheduleFinderForm
         onDirectionChange={changeDirection}
         onOriginChange={changeOrigin}
-        onOriginSelectClick={openOriginModal}
         onSubmit={openScheduleModal}
         route={route}
         selectedDirection={currentDirection}
@@ -104,7 +78,6 @@ const ScheduleFinder = ({
           closeModal={closeModal}
           directionChanged={changeDirection}
           initialDirection={currentDirection}
-          handleOriginSelectClick={handleOriginSelectClick}
           originChanged={changeOrigin}
           route={route}
           routePatternsByDirection={routePatternsByDirection}
diff --git a/assets/ts/schedule/components/SchedulePage.tsx b/assets/ts/schedule/components/SchedulePage.tsx
index 1fcc6ad2f1..bd6dc072d2 100644
--- a/assets/ts/schedule/components/SchedulePage.tsx
+++ b/assets/ts/schedule/components/SchedulePage.tsx
@@ -57,13 +57,6 @@ export const changeOrigin = (
       selectedOrigin: origin
     }
   });
-  // reopen modal depending on choice:
-  dispatch({
-    type: "OPEN_MODAL",
-    newStoreValues: {
-      modalMode: origin ? "schedule" : "origin"
-    }
-  });
 };
 
 export const changeDirection = (
@@ -88,15 +81,6 @@ const closeModal = (dispatch: Dispatch): void => {
   updateURL("");
 };
 
-export const handleOriginSelectClick = (dispatch: Dispatch): void => {
-  dispatch({
-    type: "OPEN_MODAL",
-    newStoreValues: {
-      modalMode: "origin"
-    }
-  });
-};
-
 const getDirectionAndMap = (
   schedulePageData: SchedulePageData,
   mapData: MapData,
@@ -239,7 +223,6 @@ const ScheduleNote = ({
           closeModal={closeModal}
           directionChanged={changeDirection}
           initialDirection={currentDirection}
-          handleOriginSelectClick={handleOriginSelectClick}
           originChanged={changeOrigin}
           route={route}
           routePatternsByDirection={routePatternsByDirection}
diff --git a/assets/ts/schedule/components/__tests__/ScheduleFinderTest.tsx b/assets/ts/schedule/components/__tests__/ScheduleFinderTest.tsx
index 0fcc289ab7..1b21cff772 100644
--- a/assets/ts/schedule/components/__tests__/ScheduleFinderTest.tsx
+++ b/assets/ts/schedule/components/__tests__/ScheduleFinderTest.tsx
@@ -256,47 +256,5 @@ describe("ScheduleFinder", () => {
     expect(lastSelectedOriginElement.selected).toBeFalse();
   });
 
-  it("Opens the origin modal when clicking on the origin drop-down in the schedule modal", async () => {
-    const user = userEvent.setup();
-    const dispatchSpy = jest.fn();
-    jest.spyOn(reactRedux, "useDispatch").mockImplementation(() => dispatchSpy);
-
-    renderWithProviders(
-      <ScheduleFinder
-        route={route}
-        stops={stops}
-        directionId={0}
-        services={services}
-        routePatternsByDirection={routePatternsByDirection}
-        today={today}
-        updateURL={() => {}}
-        changeDirection={() => {}}
-        changeOrigin={() => {}}
-        closeModal={() => {}}
-        scheduleNote={null}
-        hasServiceToday={true}
-      />,
-      {
-        preloadedState: {
-          modalOpen: true,
-          selectedOrigin: "123",
-          modalMode: "schedule"
-        }
-      }
-    );
-
-    // select the last node (i.e. origin drop-down) and choose an option
-    const scheduleFinderModal = screen.getByLabelText(/Schedules on the.*/);
-    const originSelectElement = within(scheduleFinderModal).getByTestId(
-      "schedule-finder-origin-select"
-    );
-    await user.click(originSelectElement);
-
-    expect(dispatchSpy).toHaveBeenCalledWith({
-      type: "OPEN_MODAL",
-      newStoreValues: {
-        modalMode: "origin"
-      }
-    });
-  });
+  
 });
diff --git a/assets/ts/schedule/components/__tests__/SchedulePageTest.tsx b/assets/ts/schedule/components/__tests__/SchedulePageTest.tsx
index 566a336800..2d47ca50d9 100644
--- a/assets/ts/schedule/components/__tests__/SchedulePageTest.tsx
+++ b/assets/ts/schedule/components/__tests__/SchedulePageTest.tsx
@@ -11,8 +11,7 @@ import { MapData, StaticMapData } from "../../../leaflet/components/__mapdata";
 import {
   SchedulePage,
   changeOrigin,
-  changeDirection,
-  handleOriginSelectClick
+  changeDirection
 } from "../SchedulePage";
 import * as schedulePage from "../SchedulePage";
 import * as routePatternsByDirectionData from "./test-data/routePatternsByDirectionData.json";
@@ -575,65 +574,9 @@ describe("SchedulePage", () => {
 
     await user.click(originSelect);
 
-    expect(dispatchSpy).toHaveBeenCalledTimes(2);
+    expect(dispatchSpy).toHaveBeenCalledTimes(1);
   });
 
-  it("Opens the origin modal", async () => {
-    const user = userEvent.setup();
-    const dispatchSpy = jest.fn();
-    jest.spyOn(reactRedux, "useDispatch").mockImplementation(() => {
-      return dispatchSpy;
-    });
-    renderWithProviders(
-      <SchedulePage
-        mapData={mapData}
-        noBranches={false}
-        schedulePageData={{
-          schedule_note: null,
-          connections: [],
-          fares,
-          fare_link: fareLink, // eslint-disable-line camelcase
-          hours,
-          holidays,
-          pdfs,
-          teasers,
-          route,
-          services,
-          stops,
-          direction_id: 0,
-          route_patterns: routePatternsByDirection,
-          today: "2019-12-05",
-          stop_tree: stopTreeData,
-          route_stop_lists: [testRouteStopList],
-          alerts: [],
-          "service_today?": true,
-          variant: null
-        }}
-      />
-    );
-
-    jest.spyOn(reactRedux, "useSelector").mockImplementation(() => {
-      return {
-        selectedDirection: 0,
-        selectedOrigin: "place-welln",
-        modalMode: "origin",
-        modalOpen: false
-      };
-    });
-
-    const buttons = screen.getAllByRole("button");
-    expect(buttons.length).toBeGreaterThan(1);
-
-    await user.click(buttons[1]);
-
-    // first call is with INITIALIZE
-    expect(dispatchSpy).toHaveBeenNthCalledWith(2, {
-      type: "OPEN_MODAL",
-      newStoreValues: {
-        modalMode: "origin"
-      }
-    });
-  });
 
   it("Closes the schedule modal", async () => {
     const user = userEvent.setup();
@@ -732,96 +675,6 @@ describe("SchedulePage", () => {
     );
   });
 
-  it("Opens the origin modal when clicking on the origin drop-down in the schedule modal", async () => {
-    const user = userEvent.setup();
-    const changeOriginSpy = jest.spyOn(schedulePage, "handleOriginSelectClick");
-
-    renderWithProviders(
-      <SchedulePage
-        mapData={mapData}
-        noBranches={false}
-        schedulePageData={{
-          schedule_note: scheduleNoteData,
-          connections: [],
-          fares,
-          fare_link: fareLink, // eslint-disable-line camelcase
-          hours,
-          holidays,
-          pdfs,
-          teasers,
-          route,
-          services,
-          stops,
-          direction_id: 0,
-          route_patterns: routePatternsByDirection,
-          today: "2019-12-05",
-          stop_tree: stopTreeData,
-          route_stop_lists: [testRouteStopList],
-          alerts: [],
-          "service_today?": true,
-          variant: null
-        }}
-      />,
-      {
-        preloadedState: {
-          selectedDirection: 0,
-          selectedOrigin: "place-welln",
-          modalMode: "schedule",
-          modalOpen: true
-        }
-      }
-    );
-    const originSelect = await waitFor(() =>
-      screen.getByTestId("schedule-finder-origin-select")
-    );
-
-    await user.click(originSelect);
-
-    await waitFor(() =>
-      expect(changeOriginSpy).toHaveBeenCalledWith(expect.any(Function))
-    );
-  });
-
-  it("Changes the origin", async () => {
-    const user = userEvent.setup();
-    renderWithProviders(
-      <SchedulePage
-        mapData={mapData}
-        noBranches={false}
-        schedulePageData={{
-          schedule_note: null,
-          connections: [],
-          fares,
-          fare_link: fareLink, // eslint-disable-line camelcase
-          hours,
-          holidays,
-          pdfs,
-          teasers,
-          route,
-          services,
-          stops,
-          direction_id: 0,
-          route_patterns: routePatternsByDirection,
-          today: "2019-12-05",
-          stop_tree: stopTreeData,
-          route_stop_lists: [testRouteStopList],
-          alerts: [],
-          "service_today?": true,
-          variant: null
-        }}
-      />
-    );
-
-    const dispatchSpy = jest.fn();
-    jest.spyOn(reactRedux, "useDispatch").mockImplementation(() => {
-      return dispatchSpy;
-    });
-    const originSelect = screen.getByTestId("schedule-finder-origin-select");
-    await user.selectOptions(originSelect, "123");
-
-    expect(dispatchSpy).toHaveBeenCalledTimes(2);
-  });
-
   it("Checks if it is a unidirectional route", () => {
     const dispatchSpy = jest.fn();
     jest.spyOn(reactRedux, "useDispatch").mockImplementation(() => {
@@ -959,7 +812,7 @@ describe("SchedulePage", () => {
   });
 
   describe("changeOrigin", () => {
-    it("should call the dispatch function twice", () => {
+    it("should call the dispatch function once", () => {
       const dispatchSpy = jest.fn();
       const testOrigin = "test-origin";
       changeOrigin(testOrigin, dispatchSpy);
@@ -969,12 +822,6 @@ describe("SchedulePage", () => {
           selectedOrigin: testOrigin
         }
       });
-      expect(dispatchSpy).toHaveBeenCalledWith({
-        type: "OPEN_MODAL",
-        newStoreValues: {
-          modalMode: "schedule"
-        }
-      });
     });
   });
 
@@ -993,16 +840,4 @@ describe("SchedulePage", () => {
     });
   });
 
-  describe("handleOriginSelectClick", () => {
-    it("should call the dispatch function setting the new direction in the state", () => {
-      const dispatchSpy = jest.fn();
-      handleOriginSelectClick(dispatchSpy);
-      expect(dispatchSpy).toHaveBeenCalledWith({
-        type: "OPEN_MODAL",
-        newStoreValues: {
-          modalMode: "origin"
-        }
-      });
-    });
-  });
 });
diff --git a/assets/ts/schedule/components/line-diagram/LineDiagram.tsx b/assets/ts/schedule/components/line-diagram/LineDiagram.tsx
index bb0b2fcdba..9431959810 100644
--- a/assets/ts/schedule/components/line-diagram/LineDiagram.tsx
+++ b/assets/ts/schedule/components/line-diagram/LineDiagram.tsx
@@ -1,6 +1,5 @@
 import React, { ReactElement, useState } from "react";
 import { Provider, useDispatch, useSelector } from "react-redux";
-import { updateInLocation } from "use-query-params";
 import { uniqBy } from "lodash";
 import SearchBox from "../../../components/SearchBox";
 import { stopForId, stopIds } from "../../../helpers/stop-tree";
@@ -31,21 +30,6 @@ interface Props {
 const stationsOrStops = (routeType: number): string =>
   [0, 1, 2].includes(routeType) ? "Stations" : "Stops";
 
-const updateURL = (origin: SelectedOrigin, direction?: DirectionId): void => {
-  /* istanbul ignore else */
-  if (window) {
-    // eslint-disable-next-line camelcase
-    const newQuery = {
-      "schedule_finder[direction_id]":
-        direction !== undefined ? direction.toString() : "",
-      "schedule_finder[origin]": origin
-    };
-    const newLoc = updateInLocation(newQuery, window.location);
-    // newLoc is not a true Location, so toString doesn't work
-    window.history.replaceState({}, "", `${newLoc.pathname}${newLoc.search}`);
-  }
-};
-
 const LineDiagram = ({
   alerts,
   directionId,
@@ -85,28 +69,16 @@ const LineDiagram = ({
         selectedOrigin: origin
       }
     });
-    // reopen modal depending on choice:
-    dispatch({
-      type: "OPEN_MODAL",
-      newStoreValues: {
-        modalMode: origin ? "schedule" : "origin"
-      }
-    });
   };
 
   const handleStopClick = (stop: RouteStop): void => {
     changeOrigin(stop.id);
     const { modalOpen: modalIsOpen, selectedOrigin } = currentState;
 
-    updateURL(stop.id, directionId);
-
     if (selectedOrigin !== undefined && !modalIsOpen) {
-      dispatch({
-        type: "OPEN_MODAL",
-        newStoreValues: {
-          modalMode: "schedule"
-        }
-      });
+      window.location.assign(
+        `/departures/?route_id=${route.id}&direction_id=${directionId}&stop_id=${stop.id}`
+      );
     }
   };
 
diff --git a/assets/ts/schedule/components/line-diagram/__tests__/LineDiagramTest.tsx b/assets/ts/schedule/components/line-diagram/__tests__/LineDiagramTest.tsx
index 2c34a4a3ec..e376dd27dd 100644
--- a/assets/ts/schedule/components/line-diagram/__tests__/LineDiagramTest.tsx
+++ b/assets/ts/schedule/components/line-diagram/__tests__/LineDiagramTest.tsx
@@ -117,32 +117,6 @@ describe("LineDiagram", () => {
     expect(screen.getByText("Stations")).toBeInTheDocument();
   });
 
-  it("should update the URL when the schedule finder modal is opened", async () => {
-    const updateInLocationSpy = jest.spyOn(UseQueryParams, "updateInLocation");
-    const user = userEvent.setup();
-    const dispatchSpy = jest.fn();
-    jest.spyOn(reactRedux, "useDispatch").mockImplementation(() => {
-      return dispatchSpy;
-    });
-    renderWithProviders(
-      <LineDiagram
-        stopTree={stopTree}
-        routeStopList={testRouteStopList}
-        route={route}
-        directionId={1}
-        alerts={[]}
-      />
-    );
-
-    const scheduleLinks = screen.getAllByText("View departures");
-    await user.click(scheduleLinks[0]);
-
-    expect(dispatchSpy).toHaveBeenCalledWith(
-      expect.objectContaining({ type: "OPEN_MODAL" })
-    );
-    expect(updateInLocationSpy).toHaveBeenCalled();
-  });
-
   it("should display the No Results card when a user doesn't query a stop", async () => {
     renderWithProviders(
       <LineDiagram
@@ -178,10 +152,13 @@ describe("LineDiagram", () => {
     expect(screen.getByText("a")).toBeDefined();
   });
 
-  it("should fire the open modal event when a user clicks on the results stop card", async () => {
+  it("should go to /departures/ when a user clicks on the results stop card", async () => {
     const user = userEvent.setup();
-    const dispatchSpy = jest.fn();
-    jest.spyOn(reactRedux, "useDispatch").mockImplementation(() => dispatchSpy);
+    const locationSpy = jest.fn();
+    Object.defineProperty(window, 'location', {
+      writable: true,
+      value: { assign: locationSpy },
+    });
     renderWithProviders(
       <LineDiagram
         stopTree={stopTree}
@@ -199,10 +176,7 @@ describe("LineDiagram", () => {
     await userEvent.click(scheduleButton);
 
     await waitFor(() => {
-      expect(dispatchSpy).toHaveBeenCalledWith({
-        type: "OPEN_MODAL",
-        newStoreValues: { modalMode: "schedule" }
-      });
+      expect(locationSpy).toHaveBeenCalled()
     });
   });
 });
diff --git a/assets/ts/schedule/components/schedule-finder/ScheduleFinderForm.tsx b/assets/ts/schedule/components/schedule-finder/ScheduleFinderForm.tsx
index 37c6f00661..2b8ae5e9e9 100644
--- a/assets/ts/schedule/components/schedule-finder/ScheduleFinderForm.tsx
+++ b/assets/ts/schedule/components/schedule-finder/ScheduleFinderForm.tsx
@@ -14,7 +14,6 @@ const validDirections = (directionInfo: DirectionInfo): DirectionId[] =>
 interface Props {
   onDirectionChange: (direction: DirectionId, dispatch: Dispatch) => void;
   onOriginChange: (origin: SelectedOrigin, dispatch: Dispatch) => void;
-  onOriginSelectClick: (dispatch: Dispatch) => void;
   onSubmit?: () => void;
   route: Route;
   selectedDirection: DirectionId;
@@ -26,7 +25,6 @@ const ScheduleFinderForm = ({
   onDirectionChange,
   onOriginChange,
   onSubmit = () => {},
-  onOriginSelectClick,
   route,
   selectedDirection,
   selectedOrigin,
@@ -41,11 +39,6 @@ const ScheduleFinderForm = ({
 
   const [originError, setOriginError] = useState(false);
 
-  const handleOriginClick = (): void => {
-    setOriginError(false);
-    onOriginSelectClick(dispatch);
-  };
-
   const handleSubmit = (event: FormEvent): void => {
     event.preventDefault();
 
@@ -112,15 +105,15 @@ const ScheduleFinderForm = ({
 
           <label className="schedule-finder__label">
             Choose an origin stop
-            <SelectContainer
-              error={originError}
-              handleClick={handleOriginClick}
-            >
+            <SelectContainer error={originError}>
               <select
                 data-testid="schedule-finder-origin-select"
-                className="c-select-custom c-select-custom--noclick notranslate"
+                className="c-select-custom notranslate"
                 value={selectedOrigin || ""}
-                onChange={e => onOriginChange(e.target.value || null, dispatch)}
+                onChange={e => {
+                  setOriginError(false);
+                  onOriginChange(e.target.value || null, dispatch);
+                }}
               >
                 <option value="">Select</option>
                 {stopsByDirection[selectedDirection].map(({ id, name }) => (
diff --git a/assets/ts/schedule/components/schedule-finder/ScheduleFinderModal.tsx b/assets/ts/schedule/components/schedule-finder/ScheduleFinderModal.tsx
index c6134fc950..987102f98c 100644
--- a/assets/ts/schedule/components/schedule-finder/ScheduleFinderModal.tsx
+++ b/assets/ts/schedule/components/schedule-finder/ScheduleFinderModal.tsx
@@ -27,7 +27,6 @@ interface Props {
   stops: SimpleStopMap;
   today: string;
   updateURL: (origin: SelectedOrigin, direction?: DirectionId) => void;
-  handleOriginSelectClick: (dispatch: Dispatch) => void;
   scheduleNote: ScheduleNote | null;
   hasServiceToday: boolean;
 }
@@ -43,7 +42,6 @@ const ScheduleFinderModal = ({
   stops,
   today,
   updateURL,
-  handleOriginSelectClick,
   scheduleNote,
   hasServiceToday
 }: Props): ReactElement => {
@@ -96,7 +94,6 @@ const ScheduleFinderModal = ({
     <ScheduleModalContent
       handleChangeDirection={handleChangeDirection}
       handleChangeOrigin={handleChangeOrigin}
-      handleOriginSelectClick={handleOriginSelectClick}
       hasServiceToday={hasServiceToday}
       route={route}
       routePatternsByDirection={routePatternsByDirection}
diff --git a/assets/ts/schedule/components/schedule-finder/ScheduleModalContent.tsx b/assets/ts/schedule/components/schedule-finder/ScheduleModalContent.tsx
index 8ebd900b9d..02d327d4bb 100644
--- a/assets/ts/schedule/components/schedule-finder/ScheduleModalContent.tsx
+++ b/assets/ts/schedule/components/schedule-finder/ScheduleModalContent.tsx
@@ -1,5 +1,4 @@
 import React, { ReactElement } from "react";
-import { Dispatch } from "redux";
 import { DirectionId, Route } from "../../../__v3api";
 import { routeToModeName } from "../../../helpers/css";
 import formattedDate from "../../../helpers/date";
@@ -20,7 +19,6 @@ import UpcomingDepartures from "./upcoming-departures/UpcomingDepartures";
 interface Props {
   handleChangeDirection: (direction: DirectionId) => void;
   handleChangeOrigin: (origin: SelectedOrigin) => void;
-  handleOriginSelectClick: (dispatch: Dispatch) => void;
   route: Route;
   selectedDirection: DirectionId;
   selectedOrigin: string;
@@ -35,7 +33,6 @@ interface Props {
 const ScheduleModalContent = ({
   handleChangeDirection,
   handleChangeOrigin,
-  handleOriginSelectClick,
   route,
   selectedDirection,
   selectedOrigin,
@@ -68,7 +65,6 @@ const ScheduleModalContent = ({
         <ScheduleFinderForm
           onDirectionChange={handleChangeDirection}
           onOriginChange={handleChangeOrigin}
-          onOriginSelectClick={handleOriginSelectClick}
           route={route}
           selectedDirection={selectedDirection}
           selectedOrigin={selectedOrigin}
diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderFormTest.tsx b/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderFormTest.tsx
index 6c72dba083..a3462973f1 100644
--- a/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderFormTest.tsx
+++ b/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderFormTest.tsx
@@ -95,7 +95,6 @@ describe("ScheduleFinderForm", () => {
       <ScheduleFinderForm
         onDirectionChange={noCall}
         onOriginChange={noCall}
-        onOriginSelectClick={noCall}
         onSubmit={noCall}
         route={oneDirectionRoute}
         selectedDirection={0}
@@ -116,7 +115,6 @@ describe("ScheduleFinderForm", () => {
       <ScheduleFinderForm
         onDirectionChange={noCall}
         onOriginChange={noCall}
-        onOriginSelectClick={noCall}
         onSubmit={submitted}
         route={route}
         selectedDirection={0}
@@ -141,7 +139,6 @@ describe("ScheduleFinderForm", () => {
       <ScheduleFinderForm
         onDirectionChange={noCall}
         onOriginChange={noCall}
-        onOriginSelectClick={noCall}
         onSubmit={submitted}
         route={route}
         selectedDirection={0}
@@ -159,7 +156,6 @@ describe("ScheduleFinderForm", () => {
       <ScheduleFinderForm
         onDirectionChange={noCall}
         onOriginChange={noCall}
-        onOriginSelectClick={noCall}
         onSubmit={submitted}
         route={route}
         selectedDirection={0}
@@ -179,12 +175,10 @@ describe("ScheduleFinderForm", () => {
 
   it("calls the origin select handler and clears the error", async () => {
     const user = userEvent.setup();
-    const originClicked = jest.fn();
     renderWithProviders(
       <ScheduleFinderForm
         onDirectionChange={noCall}
-        onOriginChange={noCall}
-        onOriginSelectClick={originClicked}
+        onOriginChange={()=>{}}
         route={route}
         selectedDirection={0}
         selectedOrigin={null}
@@ -199,11 +193,11 @@ describe("ScheduleFinderForm", () => {
     // Click on the SelectContainer for the origin select
     const originSelect = screen.getByTestId("schedule-finder-origin-select");
     await user.click(originSelect);
+    await user.selectOptions(originSelect, "123");
 
     const errorTextElement = screen.queryByText("Please provide an origin");
     expect(errorTextElement).toBeNull();
 
-    expect(originClicked).toHaveBeenCalledTimes(1);
   });
 
   it("calls the direction and origin change handlers", async () => {
@@ -214,7 +208,6 @@ describe("ScheduleFinderForm", () => {
       <ScheduleFinderForm
         onDirectionChange={directionChanged}
         onOriginChange={originChanged}
-        onOriginSelectClick={() => {}}
         onSubmit={noCall}
         route={route}
         selectedDirection={0}
@@ -237,36 +230,5 @@ describe("ScheduleFinderForm", () => {
     expect(originChanged).toHaveBeenCalledWith("123", expect.any(Function));
   });
 
-  it("detects click and keyUp events in SelectContainer elements", async () => {
-    const user = userEvent.setup();
-    const originSpy = jest.fn();
-
-    renderWithProviders(
-      <ScheduleFinderForm
-        onDirectionChange={() => {}}
-        onOriginChange={() => {}}
-        onOriginSelectClick={originSpy}
-        onSubmit={noCall}
-        route={route}
-        selectedDirection={0}
-        selectedOrigin={null}
-        stopsByDirection={stops}
-      />
-    );
-
-    // detect click event:
-    const originSelectElement = screen.getByTestId(
-      "schedule-finder-origin-select"
-    );
-    await user.click(originSelectElement);
-
-    expect(originSpy).toHaveBeenCalledTimes(1);
-
-    // detect keyUp event:
-    originSpy.mockRestore();
-
-    await waitFor(() => fireEvent.keyUp(originSelectElement, { key: "Enter" }));
-
-    expect(originSpy).toHaveBeenCalledTimes(1);
-  });
+  
 });
diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderModalTest.tsx b/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderModalTest.tsx
index fdb9a867fb..48f652637b 100644
--- a/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderModalTest.tsx
+++ b/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleFinderModalTest.tsx
@@ -167,7 +167,6 @@ describe("ScheduleFinderModal", () => {
         initialDirection={direction}
         directionChanged={directionChanged}
         originChanged={originChanged}
-        handleOriginSelectClick={() => {}}
         scheduleNote={null}
         hasServiceToday={true}
       />,
@@ -261,7 +260,6 @@ describe("ScheduleFinderModal", () => {
         initialDirection={direction}
         directionChanged={directionChanged}
         originChanged={originChanged}
-        handleOriginSelectClick={() => {}}
         scheduleNote={null}
         hasServiceToday={true}
       />,
@@ -310,7 +308,6 @@ describe("ScheduleFinderModal", () => {
         initialDirection={direction}
         directionChanged={directionChanged}
         originChanged={originChanged}
-        handleOriginSelectClick={() => {}}
         scheduleNote={null}
         hasServiceToday={true}
       />,
diff --git a/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleModalContentTest.tsx b/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleModalContentTest.tsx
index e1c402ab7e..146506c64d 100644
--- a/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleModalContentTest.tsx
+++ b/assets/ts/schedule/components/schedule-finder/__tests__/ScheduleModalContentTest.tsx
@@ -105,7 +105,6 @@ describe("ScheduleModalContent", () => {
         <ScheduleModalContent
           handleChangeDirection={() => {}}
           handleChangeOrigin={() => {}}
-          handleOriginSelectClick={() => {}}
           route={busRoute}
           stops={stops}
           selectedOrigin={stopList[0].id}
@@ -131,7 +130,6 @@ describe("ScheduleModalContent", () => {
         <ScheduleModalContent
           handleChangeDirection={() => {}}
           handleChangeOrigin={() => {}}
-          handleOriginSelectClick={() => {}}
           route={subwayRoute}
           stops={stops}
           selectedOrigin={stopList[0].id}
@@ -157,7 +155,6 @@ describe("ScheduleModalContent", () => {
         <ScheduleModalContent
           handleChangeDirection={() => {}}
           handleChangeOrigin={() => {}}
-          handleOriginSelectClick={() => {}}
           route={busRoute}
           stops={stops}
           selectedOrigin={stopList[0].id}
@@ -189,7 +186,6 @@ describe("ScheduleModalContent", () => {
         <ScheduleModalContent
           handleChangeDirection={() => {}}
           handleChangeOrigin={() => {}}
-          handleOriginSelectClick={() => {}}
           route={busRoute}
           stops={stops}
           selectedOrigin={stopList[0].id}
@@ -231,7 +227,6 @@ describe("ScheduleModalContent", () => {
         <ScheduleModalContent
           handleChangeDirection={() => {}}
           handleChangeOrigin={() => {}}
-          handleOriginSelectClick={() => {}}
           route={ferryRoute}
           stops={stops}
           selectedOrigin={stopList[0].id}
@@ -272,7 +267,6 @@ it.each`
         <ScheduleModalContent
           handleChangeDirection={() => {}}
           handleChangeOrigin={() => {}}
-          handleOriginSelectClick={() => {}}
           route={busRoute}
           stops={stops}
           selectedOrigin={stopList[0].id}
diff --git a/lib/dotcom_web/plugs/rewrite_urls.ex b/lib/dotcom_web/plugs/rewrite_urls.ex
index 2a4127216b..4417de45f1 100644
--- a/lib/dotcom_web/plugs/rewrite_urls.ex
+++ b/lib/dotcom_web/plugs/rewrite_urls.ex
@@ -25,6 +25,27 @@ defmodule DotcomWeb.Plugs.RewriteUrls do
     end
   end
 
+  # Send SF1.0 URLS to the new SF2.0
+  defp rewrite_url(%{
+         path_info: ["schedules", _, "line"],
+         params: %{
+           "route" => route_id,
+           "schedule_finder" => %{"direction_id" => direction_id, "origin" => stop_id}
+         }
+       }) do
+    "/departures/?route_id=#{route_id}&direction_id=#{direction_id}&stop_id=#{stop_id}"
+  end
+
+  # "Green" line special case
+  defp rewrite_url(%{
+         path_info: ["schedules", "Green", "line"],
+         params: %{
+           "schedule_finder" => %{"direction_id" => direction_id, "origin" => stop_id}
+         }
+       }) do
+    "/departures/?route_id=Green&direction_id=#{direction_id}&stop_id=#{stop_id}"
+  end
+
   defp rewrite_url(%{path_info: ["schedules", "Boat-F3" | _]} = conn) do
     String.replace(conn.request_path, "Boat-F3", "Boat-F1")
   end
@@ -38,6 +59,10 @@ defmodule DotcomWeb.Plugs.RewriteUrls do
   end
 
   defp merge_url(base_url, query_string) do
-    "#{base_url}?#{query_string}"
+    if base_url |> String.contains?("?") do
+      "#{base_url}&#{query_string}"
+    else
+      "#{base_url}?#{query_string}"
+    end
   end
 end
diff --git a/test/dotcom_web/plugs/rewrite_urls_test.exs b/test/dotcom_web/plugs/rewrite_urls_test.exs
index 485a91f3db..850eb78f84 100644
--- a/test/dotcom_web/plugs/rewrite_urls_test.exs
+++ b/test/dotcom_web/plugs/rewrite_urls_test.exs
@@ -11,6 +11,28 @@ defmodule DotcomWeb.Plugs.RewriteUrlsTest do
       assert conn.halted
     end
 
+    test "redirects if we're going to the old schedule finder", %{conn: conn} do
+      route_id = Faker.Pokemon.name()
+      direction_id = Faker.Util.pick(["0", "1"])
+      stop_id = Faker.Pokemon.name()
+
+      conn = %{
+        conn
+        | params: %{
+            "route" => route_id,
+            "schedule_finder" => %{"direction_id" => direction_id, "origin" => stop_id}
+          },
+          path_info: ["schedules", "red", "line"]
+      }
+
+      conn = call(conn, [])
+
+      assert redirected_to(conn, 302) ==
+               "/departures/?route_id=#{route_id}&direction_id=#{direction_id}&stop_id=#{stop_id}"
+
+      assert conn.halted
+    end
+
     test "includes a query string if present", %{conn: conn} do
       conn = %{
         conn