Fix some cases where we weren't escaping URL parameters properly in Maps.
Fix some cases where we weren't escaping URL parameters properly in Maps.

ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery