Merge "Make 'groups' a data model in the FiltersViewModel"