Changes for improved slim design of the facet tree