fixed errors with field name cases