* naming fix (_query vs. query)