Bug fixes in the dropdown controller