Minor rework of map group qa