Add support for isnull on key/value pairs