query and orderby have been deprecated in the server for a while, so the driver should switch to the fields with $ prefixes.