refactor(search): Clean up
Merge pull request #57 from ilyakam/cleanup-search

Clean up