fix(SW-3229): change to group on filtering * fix(SW-3229): change to group on filtering Approved-by: Erik Tiekstra