added calculated fields for Page3 (used for fuel consumption charts)
refactored data construction for charts