Fixed search results UI
Merge conflicts