Refactoring of FacetValues - simplify it for the UI.