bug 1124: Changed sorting order
bug 1124: Changed display to [locale] Language (country) eg[de-AT] German (Austria)
bug 1124: Sanatize properly and make code look better