CARE #86: Improved computed fields