Refactor search results