Minor update before doing legend interactivity