Add xml field descriptors to dataset form
Fix labels