CON-1709: Fixes for dropdowns