added support for other datasets + fix for unique facets