Make Health Status map play nice with CMR changes

@sravfeyn 
http://manage.dimagi.com/default.asp?107857