Fix up fieldset templates. Closes #2039