Blocks settings not submitted with multiple blocks

When using more than one Custom Search block, the submitted form values are wrong, and seems to be using the values and settings from the first block.
Investigating around the form_id value that perhaps need to be unique per block.