- fixed performance issues during tab changes