diff --git a/data-pick.php b/data-pick.php
index 96c1dfe..7092f6a 100755
--- a/data-pick.php
+++ b/data-pick.php
@@ -81,12 +81,12 @@ function update_source_step2(graphid)
 	{
 		var graph_url, hover_url;
 
-		var base_url = '<?php echo isset($config['base_url'])?$config['base_url']:''; ?>';
+		var base_url = '<?php echo isset($_ENV["APP_URL"])?$_ENV["APP_URL"]:''; ?>';
 
 		if (typeof window.opener == "object") {
 
-			graph_url = base_url + 'graph.php?height=100&width=512&device=' + graphid + '&type=device_bits&legend=no';
-			info_url = base_url + 'device/device=' + graphid +'/';
+			graph_url = base_url + '/graph.php?height=100&width=512&device=' + graphid + '&type=device_bits&legend=no';
+			info_url = base_url + '/device/device=' + graphid +'/';
 
 			opener.document.forms["frmMain"].node_new_name.value ='test';
 			opener.document.forms["frmMain"].node_label.value ='testing';
@@ -173,12 +173,12 @@ function update_source_step2(graphid,name,portid,ifAlias,ifDesc,ifIndex)
         {
                 var graph_url, hover_url;
 
-                var base_url = '<?php echo isset($config['base_url'])?$config['base_url']:''; ?>';
+                var base_url = '<?php echo isset($_ENV["APP_URL"])?$_ENV["APP_URL"]:''; ?>';
 
                 if (typeof window.opener == "object") {
 
-                        graph_url = base_url + 'graph.php?height=100&width=512&id=' + portid + '&type=port_bits&legend=no';
-                        info_url = base_url + 'graphs/type=port_bits/id=' + portid +'/';
+                        graph_url = base_url + '/graph.php?height=100&width=512&id=' + portid + '&type=port_bits&legend=no';
+                        info_url = base_url + '/graphs/type=port_bits/id=' + portid +'/';
 
                         opener.document.forms["frmMain"].node_new_name.value ='test';
                         opener.document.forms["frmMain"].node_label.value ='testing';