-Tweaked checkbox handlers in map to be less error-prone.