Fixing underscore bug/feature in non-control fields. Providing
backwards compatible support for fields having an underscore