Replace client group with tags, see case 3441, 3373