added query waypoints