Fixup tab navigation with multiple tab sets