Fix: Correct drop down list behavior