Tree delete + filtering improve