Bugfix: forgot to escape the html stuff with the new implementation.