Bug fixes when toggling data labels