Better handling of languages on export