Close #60 - Fix problem with checkboxes repopulation