Fixed NodeQuery