Case #3460 - Expand hierarchy for facet map type