Move Language display around
Update the tests
Merge pull request #1627 from sarken/issue_3719_fix

Issue 3719 fix