Added facets and Cleaning routes