really fixing search tour issue
Merge branch 'develop' into release/alpha

* develop:
  really fixing search tour issue