Tweak for search api
Merge branch 'search-file' into ui-revolution