Changed faceting, added facet for all items and changed implementation