Fixed search issues
Merge branch 'master' into deploy