Minor query changes