Refactor/fix consumption values on reports