improvements for handling dropdowns