Improved search results fully functional