Changed to correct handling for the languagecode again, now all should be fixed