Add select in form, contractNo, i18n plural and more