Issue #22807:remove hierarchical display option