Fixed selection issues with combobox
Merge pull request #65 from JakeGinnivan/ComboBoxUpdates

Fixed selection issues with combobox