why overwrite original #query here?