diff --git a/src/editprop.c b/src/editprop.c
index dd55c966..541d7362 100644
--- a/src/editprop.c
+++ b/src/editprop.c
@@ -1193,7 +1193,7 @@ void change_elem_order(void)
       xctx.wire[selectedgroup[0].n]=tmpwire;
       dbg(1, "change_elem_order(): selected element %d\n", selectedgroup[0].n);
      }
-
+     need_rebuild_selected_array = 1;
     }
 }
 
diff --git a/src/scheduler.c b/src/scheduler.c
index 4659b9f9..1f07b88b 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -750,7 +750,6 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
    no_of_pins= (xctx.inst[i].ptr+ xctx.sym)->rects[PINLAYER];
    for(p=0;p<no_of_pins;p++) {
      if(!strcmp( get_tok_value((xctx.inst[i].ptr+ xctx.sym)->rect[PINLAYER][p].prop_ptr,"name",0), argv[3])) {
-       /*str_ptr =  xctx.inst[i].node[p] ? xctx.inst[i].node[p]: "<UNCONNECTED PIN>"; */
        str_ptr =  net_name(i,p,&mult, 0);
        break;
      }
diff --git a/src/select.c b/src/select.c
index 62eefba8..b0bfde9c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -672,7 +672,7 @@ void select_element(int i,unsigned short select_mode, int fast, int override_loc
           my_snprintf(str, S(str), "pin:%s -> %s",
             get_tok_value(
                (xctx.inst[i].ptr+ xctx.sym)->rect[PINLAYER][j].prop_ptr,"name",0) ,
-            xctx.inst[i].node[j] ? xctx.inst[i].node[j] : "<UNCONNECTED_PIN>");
+            xctx.inst[i].node[j] ? xctx.inst[i].node[j] : "__UNCONNECTED_PIN__");
           statusmsg(str,2);
         }
       }
diff --git a/src/token.c b/src/token.c
index 4ba987c4..b099748e 100644
--- a/src/token.c
+++ b/src/token.c
@@ -1711,7 +1711,7 @@ void print_tedax_element(FILE *fd, int inst)
    }
    if(!get_tok_size) my_strdup(501, &pinnumber, "--UNDEF--");
    tmp = net_name(inst,i, &mult, 0);
-   if(tmp && strcmp(tmp, "<UNCONNECTED_PIN>")) {
+   if(tmp && strcmp(tmp, "__UNCONNECTED_PIN__")) {
      fprintf(fd, "conn %s %s %s %s %d\n",
            name,
            tmp,
@@ -2067,7 +2067,7 @@ const char *net_name(int i, int j, int *mult, int hash_prefix_unnamed_net)
 {
  int tmp;
  char errstr[2048];
- static const char unconn[]="<UNCONNECTED_PIN>";
+ static const char unconn[]="__UNCONNECTED_PIN__";
  char str_node[40]; /* 20161122 overflow safe */
  if(xctx.inst[i].node && xctx.inst[i].node[j]!=NULL)
  {