Integrated Davide's NodeType search.