Improved active search

Merged David Pleydell requested to merge improved_active_search into master

Hopefully improves the approximation of switching between 1km and 2km radius active search.

Merge request reports