Looks like the Facet Tree structure is now restored properly again