diff --git a/lib/documentmanagement/MDTree.inc b/lib/documentmanagement/MDTree.inc
index 0fbf66e..de86c78 100644
--- a/lib/documentmanagement/MDTree.inc
+++ b/lib/documentmanagement/MDTree.inc
@@ -289,7 +289,7 @@ class MDTree {
 		    $extraclass = ' inactive';
 		}
 
-                $treeStr .= '<li class="treenode' . $extraclass . '"><a class="pathnode" onclick="toggleElementClass(\'active\', this.parentNode);toggleElementClass(\'inactive\', this.parentNode);">' . htmlentities($treeToRender->mapnodes[$subnode_val]->getName()) . '</a>';
+                $treeStr .= '<li class="treenode' . $extraclass . '"><a class="pathnode" onclick="toggleElementClass(\'active\', this.parentNode);toggleElementClass(\'inactive\', this.parentNode);">' . htmlspecialchars($treeToRender->mapnodes[$subnode_val]->getName()) . '</a>';
                 $treeStr .= $this->_evilTreeRecursion($subnode_val, $treeToRender, $inputname);
                 $treeStr .= '</li>';
             }
@@ -301,7 +301,7 @@ class MDTree {
                     if ($leaf === $this->activevalue) {
                        $is_selected=' checked="checked"';
                     }
-                    $sValue = htmlentities($treeToRender->lookups[$leaf]->getName());
+                    $sValue = htmlspecialchars($treeToRender->lookups[$leaf]->getName());
                     $treeStr .= '<li class="leafnode"><input type="radio" name="'.$inputname.'" value="'.$sValue.'" '.$is_selected.'>' . $sValue .'</input>';
                     $treeStr .=  '</li>';            }
                 }
@@ -349,7 +349,7 @@ class MDTree {
                     if ($leaf === $this->activevalue) {
                        $is_selected=' checked="checked"';
                     }
-                    $sValue = htmlentities($treeToRender->lookups[$leaf]->getName());
+                    $sValue = htmlspecialchars($treeToRender->lookups[$leaf]->getName());
                     $treeStr .= '<li class="leafnode"><input type="radio" name="'.$inputname.'" value="'.$sValue.'" '.$is_selected.'>' . $sValue .'</input>';
                     $treeStr .=  '</li>';
                 }