Extracted faceting into FacetHelper, added FacetedCategory extension