MADS: Refactored out and fixed cursor changes for hotspots