Fixed issues with search results format