Handle sub tabs properly