Add support for search queries