Faceted Search Refactor