refactor query field name