Refactored Finder#search