Re #945 adding QueryFacet class.