Changed tokened terms to simple_fields_for