Null to "" conversions added