Made the hierarchical facet operator handling more flexible, robust and efficient.