some fixes to search results and so on