Fix issue #57 UC Checkboxes based on Maps do not return key but value of map