diff --git a/js/app/ui/system_route.js b/js/app/ui/system_route.js
index 3e779960..b24572b0 100644
--- a/js/app/ui/system_route.js
+++ b/js/app/ui/system_route.js
@@ -317,16 +317,16 @@ define([
                                         mapIds: routeDialogData.mapIds,
                                         systemFromData: dialogData.systemFromData,
                                         systemToData: {
-                                            systemId:  systemSelectData[0].systemId,
+                                            systemId:  parseInt(systemSelectData[0].id),
                                             name: systemSelectData[0].text
                                         },
-                                        stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt( routeDialogData.stargates ) : 0,
-                                        jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt( routeDialogData.jumpbridges ) : 0,
-                                        wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt( routeDialogData.wormholes ) : 0,
-                                        wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt( routeDialogData.wormholesReduced ) : 0,
-                                        wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0,
-                                        wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt( routeDialogData.wormholesFrigate ) : 0,
-                                        wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt( routeDialogData.wormholesEOL ) : 0
+                                        stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt(routeDialogData.stargates) : 0,
+                                        jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt(routeDialogData.jumpbridges) : 0,
+                                        wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt(routeDialogData.wormholes) : 0,
+                                        wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt(routeDialogData.wormholesReduced) : 0,
+                                        wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt(routeDialogData.wormholesCritical) : 0,
+                                        wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt(routeDialogData.wormholesFrigate) : 0,
+                                        wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt(routeDialogData.wormholesEOL) : 0
                                     }]
                                 };
 
@@ -354,7 +354,7 @@ define([
                 // init system select live  search ------------------------------------------------
                 // -> add some delay until modal transition has finished
                 let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
-                systemTargetSelect.delay(240).initSystemSelect({key: 'name'});
+                systemTargetSelect.delay(240).initSystemSelect({key: 'id'});
             });
 
             // show dialog
@@ -498,7 +498,7 @@ define([
                     // init default system select -----------------------------------------------------
                     // -> add some delay until modal transition has finished
                     let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
-                    systemTargetSelect.delay(240).initSystemSelect({key: 'name', maxSelectionLength: maxSelectionLength});
+                    systemTargetSelect.delay(240).initSystemSelect({key: 'id', maxSelectionLength: maxSelectionLength});
                 });
 
                 // show dialog
@@ -518,8 +518,8 @@ define([
             let tmpData = data[i];
 
             formattedData.push({
-                name: tmpData.id,
-                systemId: parseInt( tmpData.hasOwnProperty('systemId') ? tmpData.systemId : tmpData.element.getAttribute('data-systemid') )
+                systemId: parseInt(tmpData.id),
+                name: tmpData.text
             });
         }
 
diff --git a/public/js/v1.3.6/app/map/map.js b/public/js/v1.3.6/app/map/map.js
index 60994ec6..8aa336c0 100644
--- a/public/js/v1.3.6/app/map/map.js
+++ b/public/js/v1.3.6/app/map/map.js
@@ -1560,8 +1560,7 @@ define([
                             let form = $('#' + config.systemDialogId).find('form');
 
                             let systemDialogData = $(form).getFormValues();
-console.log(systemDialogData);
-return false;
+
                             // validate form
                             form.validator('validate');
 
diff --git a/public/js/v1.3.6/app/ui/system_route.js b/public/js/v1.3.6/app/ui/system_route.js
index 3e779960..b24572b0 100644
--- a/public/js/v1.3.6/app/ui/system_route.js
+++ b/public/js/v1.3.6/app/ui/system_route.js
@@ -317,16 +317,16 @@ define([
                                         mapIds: routeDialogData.mapIds,
                                         systemFromData: dialogData.systemFromData,
                                         systemToData: {
-                                            systemId:  systemSelectData[0].systemId,
+                                            systemId:  parseInt(systemSelectData[0].id),
                                             name: systemSelectData[0].text
                                         },
-                                        stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt( routeDialogData.stargates ) : 0,
-                                        jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt( routeDialogData.jumpbridges ) : 0,
-                                        wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt( routeDialogData.wormholes ) : 0,
-                                        wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt( routeDialogData.wormholesReduced ) : 0,
-                                        wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0,
-                                        wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt( routeDialogData.wormholesFrigate ) : 0,
-                                        wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt( routeDialogData.wormholesEOL ) : 0
+                                        stargates: routeDialogData.hasOwnProperty('stargates') ? parseInt(routeDialogData.stargates) : 0,
+                                        jumpbridges: routeDialogData.hasOwnProperty('jumpbridges') ? parseInt(routeDialogData.jumpbridges) : 0,
+                                        wormholes: routeDialogData.hasOwnProperty('wormholes') ? parseInt(routeDialogData.wormholes) : 0,
+                                        wormholesReduced: routeDialogData.hasOwnProperty('wormholesReduced') ? parseInt(routeDialogData.wormholesReduced) : 0,
+                                        wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt(routeDialogData.wormholesCritical) : 0,
+                                        wormholesFrigate: routeDialogData.hasOwnProperty('wormholesFrigate') ? parseInt(routeDialogData.wormholesFrigate) : 0,
+                                        wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt(routeDialogData.wormholesEOL) : 0
                                     }]
                                 };
 
@@ -354,7 +354,7 @@ define([
                 // init system select live  search ------------------------------------------------
                 // -> add some delay until modal transition has finished
                 let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
-                systemTargetSelect.delay(240).initSystemSelect({key: 'name'});
+                systemTargetSelect.delay(240).initSystemSelect({key: 'id'});
             });
 
             // show dialog
@@ -498,7 +498,7 @@ define([
                     // init default system select -----------------------------------------------------
                     // -> add some delay until modal transition has finished
                     let systemTargetSelect = $(this).find('.' + config.systemDialogSelectClass);
-                    systemTargetSelect.delay(240).initSystemSelect({key: 'name', maxSelectionLength: maxSelectionLength});
+                    systemTargetSelect.delay(240).initSystemSelect({key: 'id', maxSelectionLength: maxSelectionLength});
                 });
 
                 // show dialog
@@ -518,8 +518,8 @@ define([
             let tmpData = data[i];
 
             formattedData.push({
-                name: tmpData.id,
-                systemId: parseInt( tmpData.hasOwnProperty('systemId') ? tmpData.systemId : tmpData.element.getAttribute('data-systemid') )
+                systemId: parseInt(tmpData.id),
+                name: tmpData.text
             });
         }
 
diff --git a/public/templates/dialog/route.html b/public/templates/dialog/route.html
index 922acd45..d595e993 100644
--- a/public/templates/dialog/route.html
+++ b/public/templates/dialog/route.html
@@ -18,11 +18,11 @@
 
             <div class="col-sm-7">
                 <div class="form-group">
-                    <label class="col-sm-1 col-xs-2 control-label" for="to_system">To</label>
-                    <div class="col-sm-11 col-xs-10">
+                    <label class="col-sm-2 col-xs-2 control-label" for="to_system">To</label>
+                    <div class="col-sm-10 col-xs-10">
                         <div class="input-group">
                             <select id="to_system" name="systemToData" class="form-control {{selectClass}}" data-error="Choose a valid system" required/>
-                            <span class="help-block with-errors">Search system name</span>
+                            <span class="help-block with-errors"></span>
                         </div>
                     </div>
                 </div>
@@ -34,7 +34,7 @@
         <h4 class="pf-dynamic-area">Search options</h4>
 
         <div class="row">
-            <div class="col-sm-4">
+            <div class="col-sm-5">
                 <div class="form-group">
                     <div class="col-sm-offset-1 col-sm-11">
                         <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include stargate connections">
@@ -50,7 +50,7 @@
                 </div>
             </div>
 
-            <div class="col-sm-8">
+            <div class="col-sm-7">
                 <div class="form-group">
                     <label class="col-sm-2 control-label" for="{{mapSelectId}}">Maps</label>
                     <div class="col-sm-10">
diff --git a/public/templates/dialog/route_settings.html b/public/templates/dialog/route_settings.html
index 03d92c77..678df0ae 100644
--- a/public/templates/dialog/route_settings.html
+++ b/public/templates/dialog/route_settings.html
@@ -10,7 +10,7 @@
                             <label for="form_system"></label>
                             <select id="form_system" name="routeSystems[]" class="{{selectClass}}" multiple="multiple">
                                 {{#systemSelectOptions}}
-                                <option value="{{name}}" data-systemid="{{systemId}}" selected="selected">{{name}}</option>
+                                <option value="{{systemId}}" selected="selected">{{name}}</option>
                                 {{/systemSelectOptions}}
                             </select>
                             <span class="help-block with-errors">Set default systems (max {{maxSelectionLength}}) for route search</span>