Back to search issue fixed
Merge origin/master