Story 41622431: Bug fixes around keeping sections current with mapping and unmapping of controls