Auto-rerouting and skipping waypoints