Add total at query and fix bag ExpandedRowCount