Added waypoints query.