Added types, facet queries