Fix over-selection in dropdown