group context handling fixes and localization

Fixes #1160
// FREEBIE