Make id default to name if absent
Add a onepage_toc handler