CARE #18: Corrected IndicatorApiResource and fixed a few minor issues