queries: make arguments explicit