i18 field bug fixes