Fix for null or empty data formats, should now display correctly as well