More query kludges of the same variety.