improved node.find