add better handling for in / notin