Additional fix to #2797, fixing drilldown between middle levels.