FIX: Combobox wasn't matching selected value properly with value of 0