Fixes a bug w/ (none) combined with another selection.

Of course, (none) can be selected in a list of several other options, in
which case we need the empty string fix, too.
Merge branch 'feature/timelines_filter_custom_fields_3701' into feature/timelines_custom_fields_display_3884