better facet handling