Minor query modifs