Improved handling of keys in language-files