Minor query updates