Detangling waypoint/destination mess