Added facets and modifies data indexing script indexing