diff --git a/rd_ui/app/scripts/services.js b/rd_ui/app/scripts/services.js
index d66277f0..18f4c926 100644
--- a/rd_ui/app/scripts/services.js
+++ b/rd_ui/app/scripts/services.js
@@ -141,13 +141,13 @@
             var parts = column.split('::');
             var name = parts[1];
             if (parts[0] != '') {
-                name = parts[0].replace(' ', '_').replace(/\?/g,'');
+                name = parts[0].replace(/ /g, '_').replace(/\?/g,'');
             }
             return name;
         }
 
         QueryResult.prototype.getColumnFriendlyName = function (column) {
-            return this.getColumnCleanName(column).replace('_', ' ').replace(/(?:^|\s)\S/g, function (a) {
+            return this.getColumnCleanName(column).replace(/_/g, ' ').replace(/(?:^|\s)\S/g, function (a) {
                 return a.toUpperCase();
             });
         }