We need a dedicated aggregation mapper that can deal with field references instead of piping values through the converter as the QueryMapper does. See: #5058, #5011
