Bug fix: Improvements on search results