Re-order v1.1 fields on mapping page
mapping updates