Fix overlaying of the search results
Merge branch '48'