Improve behaviour of checkboxes for mapping