Added * to labels of required fields in sub-collections.
Set correct default format when not all formats are included.
Cleanups.