Update solr query.

Use boolean query/filter vs AND/OR's [1].  I did not test the performance difference of this, but it should be better than the original query.

[1] http://lucidworks.com/blog/why-not-and-or-and-not/