Torque query improvements