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

Includes fix from #132 and test by @jimpot from #176 .