fixing current tab bugs