NF: Correctly order facets now