Fix bug #999725 - update map keys

Update map keys so that you can return the map to its off state when a
choice option is clicked, as is the case with the region option.