Improving design of the facet tree