Cleaning up SearchResults code