CARE #37: Added automatic value calculation after indicator addition