Fixed issue with null values to display as 0