diff --git a/src/main/webapp/scripts/dialogs/extend-data-preview-dialog.js b/src/main/webapp/scripts/dialogs/extend-data-preview-dialog.js
index b7afa02c8..f813c045b 100644
--- a/src/main/webapp/scripts/dialogs/extend-data-preview-dialog.js
+++ b/src/main/webapp/scripts/dialogs/extend-data-preview-dialog.js
@@ -65,7 +65,7 @@ ExtendDataPreviewDialog.getAllProperties = function(typeID, onDone) {
     var done = false;
     
     $.getJSON(
-        "http://gridworks-helper.freebaseapps.com/get_properties_of_type?type=" + typeID + "&callback=?",
+        Gridworks.gridworksHelperService + "get_properties_of_type?type=" + typeID + "&callback=?",
         null,
         function(data) {
             if (done) return;
diff --git a/src/main/webapp/scripts/project.js b/src/main/webapp/scripts/project.js
index 650ff1b39..4acd8feda 100644
--- a/src/main/webapp/scripts/project.js
+++ b/src/main/webapp/scripts/project.js
@@ -2,6 +2,7 @@ var theProject;
 var ui = {};
 
 var Gridworks = {
+    gridworksHelperService: "http://1-0.gridworks-helper.dfhuynh.user.dev.freebaseapps.com/"
 };
 
 Gridworks.reportException = function(e) {
diff --git a/src/main/webapp/scripts/protograph/schema-alignment-ui-link.js b/src/main/webapp/scripts/protograph/schema-alignment-ui-link.js
index e4395c2b6..06e2831dd 100644
--- a/src/main/webapp/scripts/protograph/schema-alignment-ui-link.js
+++ b/src/main/webapp/scripts/protograph/schema-alignment-ui-link.js
@@ -138,7 +138,7 @@ SchemaAlignmentDialog.UILink._getPropertiesOfType = function(typeID, targetTypeI
     }
     
     $.getJSON(
-        "http://gridworks-helper.freebaseapps.com/get_properties_of_type?" + $.param(params) + "&callback=?",
+        Gridworks.gridworksHelperService + "get_properties_of_type?" + $.param(params) + "&callback=?",
         null,
         function(data) {
             if (done) return;
@@ -202,7 +202,7 @@ SchemaAlignmentDialog.UILink.prototype._showPropertySuggestPopup = function(elmt
             });
         };
         
-        for (var i = 0; i < suggestions.length; i++) {
+        for (var i = 0; i < suggestions.length && i < 10; i++) {
             createSuggestion(suggestions[i]);
         }
     } else {
diff --git a/src/main/webapp/scripts/util/custom-suggest.js b/src/main/webapp/scripts/util/custom-suggest.js
index d56dedcf0..a77aea7f0 100644
--- a/src/main/webapp/scripts/util/custom-suggest.js
+++ b/src/main/webapp/scripts/util/custom-suggest.js
@@ -66,7 +66,7 @@
 
             $.extend(data, o.ac_param);
 
-            var baseUrl = "http://gridworks-helper.freebaseapps.com/suggest_property";
+            var baseUrl = Gridworks.gridworksHelperService + "suggest_property";
             var url = baseUrl + "?" + $.param(data),
             
             cached = $.suggest.cache[url];