Tabs selection improvements