Fix for handling of "or" values for combo box filters

Change-Id: I5f7eb91195f00c39aaef76c9c8f6d5f23a8cbf4c