vast search improvements
Merge origin/master