Finished refactoring search results
12 files changed