performance fixes for group membership selection
Merge pull request #2096 from Guite/1.4

performance fixes for group membership selection