HTML content not escaped for access path. Can add anchors now.
Merge remote-tracking branch 'origin'