#488 Refactored integration of search handler with new api