diff --git a/js/app/map/map.js b/js/app/map/map.js
index 1dba299a..d8e96451 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -581,7 +581,8 @@ define([
 
             if(alias !== data.alias){
                 // alias changed
-                system.find('.' + config.systemHeadNameClass).editable('setValue', data.alias);
+                alias = data.alias ? data.alias : data.name;
+                system.find('.' + config.systemHeadNameClass).editable('setValue', alias);
             }
         }
 
diff --git a/public/js/v1.3.1/app/map/map.js b/public/js/v1.3.1/app/map/map.js
index 1dba299a..d8e96451 100644
--- a/public/js/v1.3.1/app/map/map.js
+++ b/public/js/v1.3.1/app/map/map.js
@@ -581,7 +581,8 @@ define([
 
             if(alias !== data.alias){
                 // alias changed
-                system.find('.' + config.systemHeadNameClass).editable('setValue', data.alias);
+                alias = data.alias ? data.alias : data.name;
+                system.find('.' + config.systemHeadNameClass).editable('setValue', alias);
             }
         }
 
diff --git a/public/js/v1.3.1/app/map/util.js b/public/js/v1.3.1/app/map/util.js
index ce2ecef7..0b927aa3 100644
--- a/public/js/v1.3.1/app/map/util.js
+++ b/public/js/v1.3.1/app/map/util.js
@@ -254,7 +254,7 @@ define([
         // normalize connection array
         connectionTypes = $.grep(connectionTypes, function(n){
             // 'default' is added by jsPlumb by default -_-
-            return ( n.length > 0 && n !== 'default');
+            return ( n.length > 0 && n !== 'default' && n !== 'active');
         });
 
         let data = {