update to adapt to the new added tabs_current api