This fixes #8241.  I added the extra editing capabilities for the needed fields.