adapted new facet format