DDBNEXT-121: Improvement on language switch