queries: minor query string cleanup