diff --git a/js/app/map/map.js b/js/app/map/map.js
index 1c427a2c..0a083d84 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -644,7 +644,7 @@ define([
             case 'add_first_waypoint':
             case 'add_last_waypoint':
                 systemData = system.getSystemData();
-                Util.setDestination(systemData, action);
+                Util.setDestination(action, 'system', {id: systemData.systemId, name: systemData.name});
                 break;
         }
     };
diff --git a/js/app/ui/module/system_route.js b/js/app/ui/module/system_route.js
index f806a03a..0e23b9bb 100644
--- a/js/app/ui/module/system_route.js
+++ b/js/app/ui/module/system_route.js
@@ -1240,10 +1240,10 @@ define([
                 popoverRoot.data('bs.popover').tip().find('a').on('click', function(){
                     // hint: "data" attributes should be in lower case!
                     let systemData = {
-                        systemId: $(this).data('systemid'),
+                        id: $(this).data('systemid'),
                         name: $(this).data('name')
                     };
-                    Util.setDestination(systemData, 'set_destination');
+                    Util.setDestination('set_destination', 'system', systemData);
 
                     // close popover
                     popoverRoot.popover('hide');
diff --git a/public/js/v1.5.5/app/map/map.js b/public/js/v1.5.5/app/map/map.js
index 1c427a2c..0a083d84 100644
--- a/public/js/v1.5.5/app/map/map.js
+++ b/public/js/v1.5.5/app/map/map.js
@@ -644,7 +644,7 @@ define([
             case 'add_first_waypoint':
             case 'add_last_waypoint':
                 systemData = system.getSystemData();
-                Util.setDestination(systemData, action);
+                Util.setDestination(action, 'system', {id: systemData.systemId, name: systemData.name});
                 break;
         }
     };
diff --git a/public/js/v1.5.5/app/ui/module/system_route.js b/public/js/v1.5.5/app/ui/module/system_route.js
index f806a03a..0e23b9bb 100644
--- a/public/js/v1.5.5/app/ui/module/system_route.js
+++ b/public/js/v1.5.5/app/ui/module/system_route.js
@@ -1240,10 +1240,10 @@ define([
                 popoverRoot.data('bs.popover').tip().find('a').on('click', function(){
                     // hint: "data" attributes should be in lower case!
                     let systemData = {
-                        systemId: $(this).data('systemid'),
+                        id: $(this).data('systemid'),
                         name: $(this).data('name')
                     };
-                    Util.setDestination(systemData, 'set_destination');
+                    Util.setDestination('set_destination', 'system', systemData);
 
                     // close popover
                     popoverRoot.popover('hide');