Changes to enable "faceted search" component