Fixed #51 - generation of some checkboxes