Minor fix for search api
Merge branch 'fix_search'