- Fixes to the select fields