Search fixes
Additional fixes
Search under a flag
review comments
Merge pull request #2933 from dinhviethoa/search-fixes

Search fixes