Attempt to fix bug with facets and policy enforcement