PIM-1323 : Implements filtering by groups