[Fixes #64894652] adds select and select2 controls where appropriate
[#64894652] fixes the form reset button
Merge branch 'sandbox_batch_update_autocomplete' into develop