Improve speed if a property is null
Fixed again testDumpQueryOption