Facet filters lists refactored