Update to use `find_route_with_id` to match upstream changes