Re-added 30min loiter and 5% additional fuel for reserve and 1% additional fuel for trapped fuel