Dropdown - empty value handling enhanced