Some refactor of Query.