Fix search results display
Merge branch 'master' into editor