Force query here too