new version with ordered facet