Query.query now uses the new boilerplate

Signed-off-by: David Scott <dave.scott@citrix.com>