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

* develop:
  fixing search issue
Merge branch 'release/alpha' into gh-pages

* release/alpha:
  fixing search issue