Issue #2261227 by Darren Oh: Fixed missing subfields on edit
 mapping form