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

* develop:
  fixing search issue