Added facet.query and facet.sort