Rendering none values as empty strings for #562

I am not sure if this breaks anything but in my test environment it works fine. For issue #562