Updated Query::context()