Make None values instead of ''