Filter on combobox value, not title (fixes #1836)