Refactor facet groups