Added support for facet filters
merge