871 bug switching languages breaks the map#875

dgraf-gh merged 2 commits intomaindedicatedcode/reitti:mainfrom

871-bug-switching-languages-breaks-the-mapdedicatedcode/reitti:871-bug-switching-languages-breaks-the-mapCopy head branch name to clipboard