Custom field cukes: Improve i18n step