Quick hack for multi select filters

[msp]

For reference in case someone else needs it!

It also cherry-picks the commit from #215

[ghenry]

Hi,

Would you be so kind as to do this again to the master branch?

Thanks, Gavin.