MADS: Fix for highlighting and using dynamic hotspots