Fixes #1869 - Support field types with underscores in name in Admin JS