fix issue with empty or null content for cell