It’s much less urgent, but is there any chance when there is one invalid facet, that the facet could be dis-included from the facet result set instead of facets coming back as an empty object?