v: add selector option unwrapping on if != none

v: add selector option unwrapping on if != none #18803