fix search result.
Merge branch 'fix/search_result' into develop