The change is ok.
But the category charts are still just white boxes when no data is available. I can merge this as is, or you can add them to this branch if you want.

Could you please always start your branches from origin/master so that the merge only includes commits for that issue. In this branch you have quite a few other commits.
It looks like 1add257 is the only commit relevant here. Can you start a new branch and cherry-pick that commit?

My personal preference is to rebase and not merge where possible. When I need to update a branch with commits from master I usually try to rebase. If it is too complicated I can still abort and do a normal merge, often a rebase just works.