CARE #56: Fixed percentage indicators calculation issue
CARE #44: Improved computed fields