Fixing an issue with the Map button change (caused issues with multiselector)