Merge changes to the faceted and filter query from master branch