Refactored SearchHandler v2.