issue #20212: Fix various problems with employee group