CARE #86: Improved form and computed fields management