Bug 890326 - Switch to bool filter, allowing for AND and OR style filtered queries