Exposed filter with options (term or option field) combined with unexposed filter on the same field builds broken query

Confirmed on Umami install with the Difficulty field which isn't a term field, so any field that is rendered as select seems to be able to break this

Added a fix and test coverage, but the fix seems to break something so need to look at that

The existing coverage breaks and shows too much when checking for the current value and the new coverage breaks if we don't check for this, trying to wrap my head around this but good to see the existing coverage is there

willabby → changed the visibility of the branch 3401605-exposed-filter-with to hidden.

willabby → changed the visibility of the branch 3401605-exposed-filter-with to active.

Resolved the conflicts.