Update with master version of SearchQuery