Fixed handling of combo box filters to allow multiple values w/ "OR"

Change-Id: I727b7d115d1cdfaccd9547ef1d94274903faef2a