diff --git a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
index 23fdc9b0b..2ed89a01c 100644
--- a/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
+++ b/extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js
@@ -139,12 +139,12 @@ ExtendDataPreviewDialog.prototype._show = function(properties) {
   }
 
   var suggestConfig = {
-      filter: '(all type:/type/property)',
+      type: '/type/property', // NOTE: requires patched Suggest to pass this through
       // Default returns id, lang, mid, name, notable {id,name}, score
       mql_output : JSON.stringify({'name':null,'id':null,'mid':null, '/type/property/expected_type':{'name':null,'id':null}}),
   };
   if ((this._column.reconConfig) && (this._column.reconConfig.type)) {
-    suggestConfig.filter = '(all type:/type/property (any namespace:/type/object namespace:' + this._column.reconConfig.type.id + '))';
+    suggestConfig.filter = '(should (any namespace:/type/object namespace:/common/topic namespace:' + this._column.reconConfig.type.id + '))';
   }
 
   this._elmts.addPropertyInput.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
diff --git a/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/SchemaHelper.java b/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/SchemaHelper.java
index ebf829d54..fdfdea700 100644
--- a/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/SchemaHelper.java
+++ b/extensions/freebase/src/com/google/refine/freebase/protograph/transpose/SchemaHelper.java
@@ -13,7 +13,7 @@ import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 
 public class SchemaHelper {
-    static private final String helperURL = "http://2.refine-helper.stefanomazzocchi.user.dev.freebaseapps.com/";
+    static private final String helperURL = "http://openrefine-helper.freebaseapps.com/";
     
     static private class PropertyInfo {
         String fromTypeID;
diff --git a/main/webapp/modules/core/scripts/project.js b/main/webapp/modules/core/scripts/project.js
index ca2d8dad7..57e49f425 100644
--- a/main/webapp/modules/core/scripts/project.js
+++ b/main/webapp/modules/core/scripts/project.js
@@ -35,7 +35,7 @@ var theProject;
 var ui = {};
 
 var Refine = {
-  refineHelperService: "http://1.refine-helper.stefanomazzocchi.user.dev.freebaseapps.com"
+  refineHelperService: "http://openrefine-helper.freebaseapps.com"
 };
 
 Refine.reportException = function(e) {