Improve performance of measure switching
Handle changing charts dimension