Bugfix for the HTML5 output. Add support for the new data structure.