Fixing Sorting bugs, i18n