Add translated name tag only when language and value are both present

Fixes #1796
Fixes #1797
Fix changing localized language