Minor tweaks to the query service API.