Added proposal for improving filtering of nodes