Fix to render form that will validate with mapping fields, refs #158