Tweaks before really tackling chart graph load issue