Rework form definition for explicit fields listing (ref #736)