diff --git a/livesupport/modules/storageServer/var/MetaData.php b/livesupport/modules/storageServer/var/MetaData.php
index e99f40530..e1d206920 100644
--- a/livesupport/modules/storageServer/var/MetaData.php
+++ b/livesupport/modules/storageServer/var/MetaData.php
@@ -23,7 +23,7 @@
  
  
     Author   : $Author: tomas $
-    Version  : $Revision: 1.28 $
+    Version  : $Revision: 1.29 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/MetaData.php,v $
 
 ------------------------------------------------------------------------------*/
@@ -202,6 +202,11 @@ class MetaData{
             ORDER BY id
         ";
         $all = $this->dbc->getAll($sql);
+        $transTbl = get_html_translation_table();
+        $transTbl = array_flip($transTbl);
+        foreach($all as $i=>$v){
+            $all[$i]['value']=strtr($all[$i]['value'], $transTbl);
+        }
         if(PEAR::isError($all)) return $all;
         return $all;
     }
@@ -215,7 +220,10 @@ class MetaData{
      */
     function setMetadataEl($mid, $value=NULL)
     {
-        if(!is_null($value)){ $value = htmlentities($value); }
+        if(!is_null($value)){
+            $transTbl = get_html_translation_table();
+            $value = strtr($value, $transTbl);
+        }
         $info = $this->dbc->getRow("
             SELECT parmd.predns as parns, parmd.predicate as parname,
                 md.predxml, md.predns as chns, md.predicate as chname