Further Tuning to Waypoints/Legs associations