Other logic improvements for CO2 emissions

Bharath will need to check on if the logic switch is required

Short haul and long haul logic improvement - Done

Storage condition check with Bharath on Storage condition desc