Update predicates to deal with null as a value. Still need to implement "is not null" comparisons