Continue refactoring: applying search facets dynamically via the enum