More work on restoring facet tree