changed filter notation, added support for null comparisons