Case 2796 - Added facets and some fixes.