MADS: Further fixes for hotspot highlighting