(#47) Fixed map click activation/deactivation. I mistakenly thought it was passing the click control by reference, not by value. Still not sure why there are two click controls on the map though.