Fixed dehighlighting bug on map

Amongst other things