Reworking facet handling