Finish previous refactor.
Fix facet count bug.