More query reorganisation, in an attempt to be index friendly