Fixed Combo box filtering issue