Add support for multiple facet selection