Fixes for tabbed TOC

Re-fixes #1185