diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
index d62afaa..ad729a2 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
@@ -140,9 +140,9 @@ public class ServiceListView
                     }
 
                     //
-                    data.setContent("softwareName", StringUtils.defaultIfBlank(service.getSoftwareName(), "n/a"));
-                    data.setContent("softwareVersion", StringUtils.defaultIfBlank(service.getSoftwareVersion(), "n/a"));
-                    data.setContent("softwareLicenseName", StringUtils.defaultIfBlank(service.getSoftwareLicenseName(), "n/a"));
+                    data.setEscapedContent("softwareName", StringUtils.defaultIfBlank(service.getSoftwareName(), "n/a"));
+                    data.setEscapedContent("softwareVersion", StringUtils.defaultIfBlank(service.getSoftwareVersion(), "n/a"));
+                    data.setEscapedContent("softwareLicenseName", StringUtils.defaultIfBlank(service.getSoftwareLicenseName(), "n/a"));
                     if (StringUtils.isNotBlank(service.getSoftwareWebsite()))
                     {
                         data.setEscapedAttribute("serviceListLine", index, "softwareWebsiteLink", "href", service.getSoftwareWebsite());