Text TOC improvements