diff --git a/html/fid_card.php b/html/fid_card.php
index 839caf80f..1ee5d07ac 100644
--- a/html/fid_card.php
+++ b/html/fid_card.php
@@ -146,13 +146,13 @@ if (sizeof($sql) != 0 )
 
         $sql_name=$cn->execute('get_name',array($sql[$i]['f_id'],23));
         if (Database::num_row($sql_name) == 1) $quick_code=Database::fetch_result($sql_name,0,0);
-
+	$fid=htmlentities($_REQUEST['FID']);
 
         /* Highlight the found pattern with bold format */
-        $name=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',h($name));
-        $qcode=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',h($quick_code));
-        $desc=str_ireplace($_REQUEST['FID'],'<em>'.$_REQUEST['FID'].'</em>',h($desc));
-        printf('<li id="%s">%s <span class="informal"> %s %s</span></li>',
+        $name=str_ireplace($_REQUEST['FID'],'<em>'.$fid.'</em>',h($name));
+        $qcode=str_ireplace($_REQUEST['FID'],'<em>'.$fid.'</em>',h($quick_code));
+        $desc=str_ireplace($_REQUEST['FID'],'<em>'.$fid.'</em>',h($desc));
+        printf('<li id="%s">%s <span class="informal">%s %s</span></li>',
                $quick_code,
                $quick_code,
                $name,
diff --git a/html/js/ajax_fiche.js b/html/js/ajax_fiche.js
index 88503ed4b..28e7afb0b 100644
--- a/html/js/ajax_fiche.js
+++ b/html/js/ajax_fiche.js
@@ -116,6 +116,7 @@ function ajaxFid(p_ctl)
     }
     queryString=queryString+"&j="+jrn+'&gDossier='+gDossier;
     queryString=queryString+'&ctl='+p_ctl.id;
+    queryString=encodeURI(queryString);
 
     var action=new Ajax.Request (
                    "fid.php",