Fixes to form drop down