Simplify check for no active group
Merge branch 'employee-list-filter'