Support field name with underscore properly