Add support for search query params