Make sure checkbox values are fetched and added correctly - Fixes #32