fix a problem with same field names, refactor