TOC working in way you described is almost ready. In few weeks (lot of other work to do) I will prepare and upload patch with it. cezaryece