Improve facet count method