Improve TabbedApps route handling