Update the node selector implementation to handle ordering of select calls

Update the node selector implementation to handle ordering of select calls #2413