Fix the bug in search and Help
Merge branch 'develop'