Non static match condition

Review PR
this means we can safely remove the check in the if condition and just call nodeSelectorMatches, Am I right.