Hierarchical facets trees 3

OK.  I can see we've done it elsewhere now.