Node xpath support complete and tested

Refactor constant to NODES for readability