Bugfix
Added set tab selection for different calls