fix chart data labels / values and percentage hack