CARE #25: Fixed minor issues indicator and query creation; fixed indicator list