introduced new interface for facet results + refactoring for class names