Improve handling for Table of Contents on content (uses portlet classes)