CARE #86: Improved map report