improved handling of dropdowns