Added class search and faceting