Refactored list of facet terms