patches to integrate form_builder and select_or_other