[Fixes #64894652] adds select and select2 controls where appropriate