Revert preventing Select Nodes logic