Made start with new facet filtering method. Clean up.