more changes for node selectors