Add widget_type and field_type when exploding a field
Move 'choices' handling out of inner loop
Add 'display' when field has 'choices'