update metric reports to use result grouping, including switch to new api