Add support for custom search queries