Make Health Status map play nice with CMR changes