Added support for cluster / facet exclusion