UCJEPS-461: make searching for Null values work