PM: tabs - fix after code restructure