Improve extraction of waypoints from the route