unify query syntax
2.1.2