CARE #37: Removed auto calculation for some indicators