diff --git a/app/code/core/Mage/Widget/Model/Widget.php b/app/code/core/Mage/Widget/Model/Widget.php
index 87c1feeb7c2..7286027f258 100644
--- a/app/code/core/Mage/Widget/Model/Widget.php
+++ b/app/code/core/Mage/Widget/Model/Widget.php
@@ -256,7 +256,7 @@ public function getWidgetDeclaration($type, $params = array(), $asIs = true)
             '<img id="%s" src="%s" title="%s">',
             $this->_idEncode($directive),
             $image,
-            Mage::helper('core')->urlEscape($directive)
+            Mage::helper('core')->escapeUrl($directive)
         );
         return $html;
     }
diff --git a/app/design/frontend/base/default/template/catalog/layer/filter.phtml b/app/design/frontend/base/default/template/catalog/layer/filter.phtml
index a0491adf57e..1b9e76f894e 100644
--- a/app/design/frontend/base/default/template/catalog/layer/filter.phtml
+++ b/app/design/frontend/base/default/template/catalog/layer/filter.phtml
@@ -36,7 +36,7 @@
 <?php foreach ($this->getItems() as $_item): ?>
     <li>
         <?php if ($_item->getCount() > 0): ?>
-        <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
+        <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
         <?php else: echo $_item->getLabel() ?>
         <?php endif ?>
         <?php if ($this->shouldDisplayProductCount()): ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml b/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
index 9b5ff7c4ba7..a1eed2443dd 100644
--- a/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
@@ -36,7 +36,7 @@
 <?php foreach ($this->getItems() as $_item): ?>
     <li>
         <?php if ($_item->getCount() > 0): ?>
-            <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>">
+            <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>">
                 <?php echo $_item->getLabel() ?>
                 <?php if ($this->shouldDisplayProductCount()): ?>
                 <span class="count">(<?php echo $_item->getCount() ?>)</span>
diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
index 179935f0278..8bf34c52620 100644
--- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
+++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
@@ -51,7 +51,7 @@ $_swatchOuterHeight = $_dimHelper->getOuterHeight(Mage_ConfigurableSwatches_Help
         ?>
         <li<?php if ($_hasImage){ echo ' style="line-height: ' . $_lineHeight . 'px;"'; } ?>>
             <?php if ($_hasItems): ?>
-                <a href="<?php echo $this->urlEscape($_item->getUrl()) ?>" class="<?php echo $_linkClass ?>">
+                <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>" class="<?php echo $_linkClass ?>">
             <?php else: ?>
                 <span class="<?php echo $_linkClass ?>">
             <?php endif ?>