Minor query interface fixes.