Fix issue #14: Very slow session load due to history missuse