Added mode and some special case handling to map group QA