Clean up facets code a but.
Comments.
Factor out apply facet call to ready for more 
specific group sets.