diff --git a/opensocial/shindigorng.properties.template b/opensocial/shindigorng.properties.template
index 7acf82b62..d62afd24f 100644
--- a/opensocial/shindigorng.properties.template
+++ b/opensocial/shindigorng.properties.template
@@ -174,18 +174,27 @@ orng.RDFConverter = elda
 orng.tokenservice.port = 8777
 orng.securityTokenKeyFile = @TOKEN_KEY_FILE@
 
+#
+# Note that orng.systemDomain can be commented out in a production environment.  
+# It is used to trigger system specific (VIVO or Profiles) means for URI to URL conversion.  
+# This is sometimes necessary when a "fake" domain is being used in a testing/development environment 
+#
+
 # orng.system must be set to Profiles or VIVO
 #orng.system = Profiles
 #orng.dbDriver = com.microsoft.sqlserver.jdbc.SQLServerDriver
 #orng.dbURL = jdbc:sqlserver://dev-sql-ctsi.ucsf.edu;instanceName=default;portNumber=1433;databaseName=profiles_100
 #orng.dbUser = App_Profiles10
 #orng.dbPassword = Password1234
+#orng.systemDomain = http://localhost/profiles
 
 orng.system = VIVO
 orng.dbDriver = @DATA_SOURCE_DRIVER@
 orng.dbURL = @DATA_SOURCE_URL@
 orng.dbUser = @DATA_SOURCE_USERNAME@
 orng.dbPassword = @DATA_SOURCE_PASSWORD@
+orng.systemDomain = NOT_USED
+
 
 
 
diff --git a/opensocial/shindigorng.war b/opensocial/shindigorng.war
index 7d2d1d99b..1f428d6f1 100644
Binary files a/opensocial/shindigorng.war and b/opensocial/shindigorng.war differ
diff --git a/webapp/web/js/openSocial/orng.js b/webapp/web/js/openSocial/orng.js
index 19b442295..2e9166799 100644
--- a/webapp/web/js/openSocial/orng.js
+++ b/webapp/web/js/openSocial/orng.js
@@ -253,9 +253,6 @@ my.generateGadgets = function(metadata) {
 };
 
 my.init = function() {
-    // overwrite this RPC function.  Do it at this level so that rpc.f (this.f) is accessible for getting module ID
-//    gadgets.rpc.register('requestNavigateTo', doOrngNavigation);
-
     shindig.container.gadgetClass = OrngGadget;
     shindig.container.layoutManager = new OrngLayoutManager();    
     shindig.container.setNoCache(my.noCache);
@@ -286,7 +283,7 @@ OrngGadgetService.inherits(shindig.IfrGadgetService);
 
 OrngGadgetService.prototype.requestNavigateTo = function(view, opt_params) {
     var viewConfig = gadgets.config.get('views')[view];
-    var url = viewConfig.urlTemplate;
+    var url = '/' + location.pathname.split('/')[1] + '/' + viewConfig.urlTemplate;
 
     url += window.location.search.substring(1);