Updates to allow linking from headings