Add Option widget to avoid failed form validation that blocks call