Improve field type handling, and display of field values/types