diff --git a/themes/blueprint/templates/RecordDriver/EDS/core.phtml b/themes/blueprint/templates/RecordDriver/EDS/core.phtml
index bcbad12e7e6cc28c7de9f9e475e03bb6d64607ab..79fa1d3bf10131f7c4aa5f643fb1010626d066ab 100644
--- a/themes/blueprint/templates/RecordDriver/EDS/core.phtml
+++ b/themes/blueprint/templates/RecordDriver/EDS/core.phtml
@@ -65,7 +65,7 @@
     <? $pLink = $this->driver->getPLink();
         if($pLink): ?>
       <span>
-        <a href="<?=$pLink?>">
+        <a href="<?=$this->escapeHtmlAttr($pLink)?>">
           <?=$this->transEsc('View in EDS')?>
         </a>
       </span><br />
@@ -94,7 +94,7 @@
             $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
             $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
         <span>
-          <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+          <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
             <? if ($icon): ?><img src="<?=$icon?>" /><? endif; ?><?=$name?>
           </a>
         </span><br />
diff --git a/themes/blueprint/templates/RecordDriver/EDS/result-list.phtml b/themes/blueprint/templates/RecordDriver/EDS/result-list.phtml
index 1c3b59d0be594b12fb57e208896b4bdee19e1311..ebfe35f8f8c37a1bd67a757a5ec1ba1f7e3d464c 100644
--- a/themes/blueprint/templates/RecordDriver/EDS/result-list.phtml
+++ b/themes/blueprint/templates/RecordDriver/EDS/result-list.phtml
@@ -54,7 +54,7 @@
             $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
             $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
         <span>
-          <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+          <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
             <? if ($icon): ?><img src="<?=$icon?>" /><? endif; ?><?=$name?>
           </a>
         </span>
diff --git a/themes/bootstrap/templates/RecordDriver/EDS/core.phtml b/themes/bootstrap/templates/RecordDriver/EDS/core.phtml
index 9479852c8bd1d90ad766c05e77da8617692f6afe..747833f2d1410b5a994b5a813a015ea693b34813 100644
--- a/themes/bootstrap/templates/RecordDriver/EDS/core.phtml
+++ b/themes/bootstrap/templates/RecordDriver/EDS/core.phtml
@@ -25,7 +25,7 @@
       <? $pLink = $this->driver->getPLink();
           if($pLink): ?>
         <span>
-          <a href="<?=$pLink?>">
+          <a href="<?=$this->escapeHtmlAttr($pLink)?>">
             <?=$this->transEsc('View in EDS')?>
           </a>
         </span><br />
@@ -54,7 +54,7 @@
               $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
               $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
           <span>
-            <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+            <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
               <? if ($icon): ?><img src="<?=$icon?>" /> <? endif; ?><?=$name?>
             </a>
           </span><br />
diff --git a/themes/bootstrap/templates/RecordDriver/EDS/result-list.phtml b/themes/bootstrap/templates/RecordDriver/EDS/result-list.phtml
index 2e1401e47ae6e9f1b82d84f104050ebbc5a82bea..a2cdf646b58986a49605294916b2fb9ef7ede9ef 100644
--- a/themes/bootstrap/templates/RecordDriver/EDS/result-list.phtml
+++ b/themes/bootstrap/templates/RecordDriver/EDS/result-list.phtml
@@ -53,7 +53,7 @@
           $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
           $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
       <span>
-        <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+        <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
           <? if ($icon): ?><img src="<?=$icon?>" /> <? endif; ?><?=$name?>
         </a>
       </span>
diff --git a/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml b/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml
index e8c5081a9ea2b3fe4918a565ae86d2766667830f..9c3ec6964a07957ea5cf661724529c8db6a174f6 100644
--- a/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/EDS/core.phtml
@@ -25,7 +25,7 @@
       <? $pLink = $this->driver->getPLink();
           if($pLink): ?>
         <span>
-          <a href="<?=$pLink?>">
+          <a href="<?=$this->escapeHtmlAttr($pLink)?>">
             <?=$this->transEsc('View in EDS')?>
           </a>
         </span><br />
@@ -54,7 +54,7 @@
               $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
               $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
           <span>
-            <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+            <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
               <? if ($icon): ?><img src="<?=$icon?>" /> <? endif; ?><?=$name?>
             </a>
           </span><br />
diff --git a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
index cd9fef56a0d7b035c5b1c56d94c0fd7825a8ea66..7748ac658d59fdf62c09ac67e1b86e3633e8cba7 100644
--- a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
@@ -53,7 +53,7 @@
           $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
           $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
       <span>
-        <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+        <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
           <? if ($icon): ?><img src="<?=$icon?>" /> <? endif; ?><?=$name?>
         </a>
       </span>
diff --git a/themes/jquerymobile/templates/RecordDriver/EDS/core.phtml b/themes/jquerymobile/templates/RecordDriver/EDS/core.phtml
index 5dedde78f68957a95f167ca8f6bd49664cc99741..2df2a31f9385cb564c34f847552c5ac47a1ee38f 100644
--- a/themes/jquerymobile/templates/RecordDriver/EDS/core.phtml
+++ b/themes/jquerymobile/templates/RecordDriver/EDS/core.phtml
@@ -19,7 +19,7 @@
     <? endif; ?>
     <? $pLink = $this->driver->getPLink();
         if($pLink): ?>
-        <br/><a href="<?=$pLink?>">
+        <br/><a href="<?=$this->escapeHtmlAttr($pLink)?>">
           <?=$this->transEsc('View in EDS')?>
         </a>
     <? endif; ?>
@@ -41,7 +41,7 @@
               $mot = isset($customLink['MouseOverText'])? $customLink['MouseOverText'] : '';
               $icon = isset ($customLink['Icon']) ? $customLink['Icon'] : '';
               $name = isset($customLink['Name']) ? $customLink['Name'] : '';?>
-          <a href="<?=$url?>" target="_blank" title="<?=$mot?>" class="custom-link">
+          <a href="<?=$this->escapeHtmlAttr($url)?>" target="_blank" title="<?=$mot?>" class="custom-link">
             <? if ($icon): ?><img src="<?=$icon?>" /> <? endif; ?><?=$name?>
           </a><br/>
         <? endforeach; ?>