bug fixes on localized field order