Changed the way we include nodes in the filter