Eric: Search Refactor