group context handling fixes and localization

Fixes #1347
Fixes #1341
Fixes #1160
// FREEBIE