Reorganize groups of v1.1 fields on mapping page