Fix to show current language rather than always Default