CARE #86: Improved indicators and query fetching