Fix hierarchical filtering issue