Added facets functionality + update script