Extend simple search of nodes (cont.)