Changes to make the node attribute search keys explicit and extensible