PMO-2536: do not re-build the tree when filtering