added search waypoints and fixed transition waypoints