Support for query condition and NULL encoding