Improve language switch