Deep Search Refactored