Merge pull request #174 from jezdez/more-facets

Added support for filter and query facets.
Added tests for filter and query facets.