#11: add more fields in the query API