In the refactoring of form elements in the view, the labels were lost on most field names. Restore these. In the process, also exclude empty DOM elements in the same output.