diff --git a/src/draw.c b/src/draw.c
index 42072586..c2652c4f 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -2749,13 +2749,14 @@ static void draw_graph_variables(int wcnt, int wave_color, int n_nodes, int swee
   }
   /* draw node labels in graph */
   if(bus_msb) {
-    if(gr->unity != 1.0) my_snprintf(tmpstr, S(tmpstr), "%s[%c]", find_nth(ntok, ";,", "\"", 0, 1), gr->unity_suffix);
-    else  my_snprintf(tmpstr, S(tmpstr), "%s",find_nth(ntok, ";,", "\"", 0, 1));
+    if(gr->unity != 1.0) my_snprintf(tmpstr, S(tmpstr), "%s[%c]", 
+         tcl_hook2(find_nth(ntok, ";,", "\"", 0, 1)), gr->unity_suffix);
+    else  my_snprintf(tmpstr, S(tmpstr), "%s",tcl_hook2(find_nth(ntok, ";,", "\"", 0, 1)));
   } else {
     char *ntok_ptr = NULL;
     char *alias_ptr = NULL;
     if(strstr(ntok, ";")) {
-       my_strdup2(_ALLOC_ID_, &alias_ptr, find_nth(ntok, ";", "\"", 0, 1));
+       my_strdup2(_ALLOC_ID_, &alias_ptr, tcl_hook2(find_nth(ntok, ";", "\"", 0, 1)));
        my_strdup2(_ALLOC_ID_, &ntok_ptr, find_nth(ntok, ";", "\"", 0, 2));
     }
     else {
diff --git a/src/xschem.tcl b/src/xschem.tcl
index 7475df37..b36f9ab0 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -2828,7 +2828,7 @@ proc graph_edit_properties {n} {
   graph_fill_listbox
 
   # fill data in right textbox
-  set plotted_nodes [xschem getprop rect 2 $n node 0]
+  set plotted_nodes [xschem getprop rect 2 $n node 2]
   if {[string length $plotted_nodes] > 0 && [string index $plotted_nodes end] ne "\n"} {append plotted_nodes \n}
   .graphdialog.center.right.text1 insert 1.0 $plotted_nodes
   graph_update_nodelist