Changes to make the node attribute search keys