custom TOC loading improvements