diff --git a/bigdata-war-html/src/main/webapp/html/js/workbench.js b/bigdata-war-html/src/main/webapp/html/js/workbench.js
index 993523e8c2..0ec7f0446b 100644
--- a/bigdata-war-html/src/main/webapp/html/js/workbench.js
+++ b/bigdata-war-html/src/main/webapp/html/js/workbench.js
@@ -1628,9 +1628,12 @@ function showPage(n) {
                linkText = escapeHTML(text).replace(/\n/g, '<br>');
                if(binding.type == 'typed-literal') {
                   tdData = ' class="literal" data-datatype="' + binding.datatype + '"';
+                  text = linkText;
                } else {
                   if(binding.type == 'uri' || binding.type == 'sid') {
                      text = '<a href="' + buildExploreHash(text) + '">' + linkText + '</a>';
+                  } else {
+                     text = linkText;
                   }
                   tdData = ' class="' + binding.type + '"';
                   if(binding['xml:lang']) {
@@ -1693,7 +1696,7 @@ function exploreSubmit(e) {
 }
 
 function buildExploreHash(uri) {
-   return '#explore:' + NAMESPACE + ':' + uri;
+   return '#explore:' + NAMESPACE + ':' + encodeURIComponent(uri);
 }
 
 function loadURI(target) {