Added support for custom search handler