2.0 for kquery's refactor