Switch to checkboxes.
Merge branch '7.x-3.x' into add-and-change

Delete entity entry in table "flag_lists_content" as this provokes an issue on collection duplicate