Fixed incorrect active tab calls