Further query improvements.