Fixes to drop down