[#83887612] update ToC behavior