Correct logic (Take 1) for short circuit logic on MultipleChoiceFilter

Includes fix from #132 and test by @jimpot from #176 .
Oops. I meant to add this test after this PR. But with the fix from #132 in place this test needs a `required=True` in order to demonstrate the issue. (I'll added that already preparing the next fix.)

// cc. @jimpot