Change construction of SearchQuery