Minor query setup tweak