Feature/terms quickfix for form