Added a check for valid values when merging query string parameters.
Reworked Solr results display to allow for both ORed and ANDed facets.