I was experiencing a similar issue, as part of my site is Swiss, and in Switzerland, they speak French and German, so it can get confusing using flags only. Hopefully this issue has been resolved :)...