Support for nulls in query()