fixing a search issue right after the tour
Merge branch 'develop' into release/alpha