added filtering on node type