More work in dropdowns
Bugfix