Now unbinds map click correctly

Update to performance issue fix