Fix for history form key storage