Fix filters to work with mangled enums

Also respects configured filterableFacets
Merge branch 'filterable-facets'