Switch .query() to an options object, rather than use discreet args.