Updated filtering usable to work with the new 'not' (!) and 'null' (-) query.