Improved Map to support TermStats aggregations