switched to real search waypoints
Merge branches 'version4' and 'temp3' into version4