Refactored Hybrid Search