diff --git a/app/main/controller/api/route.php b/app/main/controller/api/route.php
index 4c9a3610..7dbd5f09 100644
--- a/app/main/controller/api/route.php
+++ b/app/main/controller/api/route.php
@@ -119,6 +119,7 @@ class Route extends \Controller\AccessController {
             $whereQuery = "";
             $includeScopes = [];
             $includeTypes = [];
+            $includeEOL = true;
 
             if( $filterData['stargates'] === true){
                 // include "stargates" for search
@@ -146,6 +147,10 @@ class Route extends \Controller\AccessController {
                 if( $filterData['wormholesCritical'] === true ){
                     $includeTypes[] = 'wh_critical';
                 }
+
+                if( $filterData['wormholesEOL'] === false ){
+                    $includeEOL = false;
+                }
             }
 
             // search connections -------------------------------------------------------
@@ -157,6 +162,9 @@ class Route extends \Controller\AccessController {
                     $whereQuery .= " `connection`.`type` REGEXP '" . implode("|", $includeTypes) . "' AND ";
                 }
 
+                if(!$includeEOL){
+                    $whereQuery .= " `connection`.`eolUpdated` IS NULL AND ";
+                }
 
                 $query = "SELECT
                         `system_src`.`regionId` regionId,
@@ -521,7 +529,8 @@ class Route extends \Controller\AccessController {
                     'jumpbridges' => (bool) $routeData['jumpbridges'],
                     'wormholes' => (bool) $routeData['wormholes'],
                     'wormholesReduced' => (bool) $routeData['wormholesReduced'],
-                    'wormholesCritical' => (bool) $routeData['wormholesCritical']
+                    'wormholesCritical' => (bool) $routeData['wormholesCritical'],
+                    'wormholesEOL' => (bool) $routeData['wormholesEOL']
                 ];
 
                 $returnRoutData = [
diff --git a/js/app/ui/system_route.js b/js/app/ui/system_route.js
index 87b12626..986ca8bd 100644
--- a/js/app/ui/system_route.js
+++ b/js/app/ui/system_route.js
@@ -151,11 +151,12 @@ define([
             mapIds: (rowData.hasOwnProperty('mapIds')) ? rowData.mapIds : [],
             systemFromData: (rowData.hasOwnProperty('systemFromData')) ? rowData.systemFromData : {},
             systemToData: (rowData.hasOwnProperty('systemToData')) ? rowData.systemToData : {},
-            stargates: (rowData.hasOwnProperty('stargates')) ? rowData.stargates : 1,
-            jumpbridges: (rowData.hasOwnProperty('jumpbridges')) ? rowData.jumpbridges : 1,
-            wormholes: (rowData.hasOwnProperty('wormholes')) ? rowData.wormholes : 1,
-            wormholesReduced: (rowData.hasOwnProperty('wormholesReduced')) ? rowData.wormholesReduced : 1,
-            wormholesCritical: (rowData.hasOwnProperty('wormholesCritical')) ? rowData.wormholesCritical : 1
+            stargates: (rowData.hasOwnProperty('stargates')) ? rowData.stargates | 0 : 1,
+            jumpbridges: (rowData.hasOwnProperty('jumpbridges')) ? rowData.jumpbridges | 0 : 1,
+            wormholes: (rowData.hasOwnProperty('wormholes')) ? rowData.wormholes | 0 : 1,
+            wormholesReduced: (rowData.hasOwnProperty('wormholesReduced')) ? rowData.wormholesReduced | 0 : 1,
+            wormholesCritical: (rowData.hasOwnProperty('wormholesCritical')) ? rowData.wormholesCritical | 0 : 1,
+            wormholesEOL: (rowData.hasOwnProperty('wormholesEOL')) ? rowData.wormholesEOL | 0 : 1
         };
     };
 
@@ -243,7 +244,8 @@ define([
                                         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
+                                        wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0,
+                                        wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt( routeDialogData.wormholesEOL ) : 0
                                     }]
                                 };
 
@@ -386,11 +388,13 @@ define([
         var wormholeCheckbox = routeDialog.find('input[type="checkbox"][name="wormholes"]');
         var wormholeReducedCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesReduced"]');
         var wormholeCriticalCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesCritical"]');
+        var wormholeEolCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesEOL"]');
 
         // store current "checked" state for each box ---------------------------------------------
         var storeCheckboxStatus = function(){
             wormholeReducedCheckbox.data('selectState', wormholeReducedCheckbox.prop('checked'));
             wormholeCriticalCheckbox.data('selectState', wormholeCriticalCheckbox.prop('checked'));
+            wormholeEolCheckbox.data('selectState', wormholeEolCheckbox.prop('checked'));
         };
 
         // on wormhole checkbox change ------------------------------------------------------------
@@ -399,9 +403,11 @@ define([
             if( $(this).is(':checked') ){
                 wormholeReducedCheckbox.prop('disabled', false);
                 wormholeCriticalCheckbox.prop('disabled', false);
+                wormholeEolCheckbox.prop('disabled', false);
 
                 wormholeReducedCheckbox.prop('checked', wormholeReducedCheckbox.data('selectState'));
                 wormholeCriticalCheckbox.prop('checked', wormholeCriticalCheckbox.data('selectState'));
+                wormholeEolCheckbox.prop('checked', wormholeEolCheckbox.data('selectState'));
             }else{
                 storeCheckboxStatus();
 
@@ -409,6 +415,8 @@ define([
                 wormholeReducedCheckbox.prop('disabled', true);
                 wormholeCriticalCheckbox.prop('checked', false);
                 wormholeCriticalCheckbox.prop('disabled', true);
+                wormholeEolCheckbox.prop('checked', false);
+                wormholeEolCheckbox.prop('disabled', true);
             }
         }.bind(wormholeCheckbox);
 
@@ -473,6 +481,7 @@ define([
             wormholes: routeData.wormholes,
             wormholesReduced: routeData.wormholesReduced,
             wormholesCritical: routeData.wormholesCritical,
+            wormholesEOL: routeData.wormholesEOL,
             reload: {
                 button: reloadButton
             },
@@ -679,7 +688,8 @@ define([
                                     jumpbridges: rowData.jumpbridges ? 1 : 0,
                                     wormholes: rowData.wormholes ? 1 : 0,
                                     wormholesReduced: rowData.wormholesReduced ? 1 : 0,
-                                    wormholesCritical: rowData.wormholesCritical ? 1 : 0
+                                    wormholesCritical: rowData.wormholesCritical ? 1 : 0,
+                                    wormholesEOL: rowData.wormholesEOL ? 1 : 0
                                 }]
                             };
 
diff --git a/public/js/v1.1.5/app/ui/system_route.js b/public/js/v1.1.5/app/ui/system_route.js
index 87b12626..986ca8bd 100644
--- a/public/js/v1.1.5/app/ui/system_route.js
+++ b/public/js/v1.1.5/app/ui/system_route.js
@@ -151,11 +151,12 @@ define([
             mapIds: (rowData.hasOwnProperty('mapIds')) ? rowData.mapIds : [],
             systemFromData: (rowData.hasOwnProperty('systemFromData')) ? rowData.systemFromData : {},
             systemToData: (rowData.hasOwnProperty('systemToData')) ? rowData.systemToData : {},
-            stargates: (rowData.hasOwnProperty('stargates')) ? rowData.stargates : 1,
-            jumpbridges: (rowData.hasOwnProperty('jumpbridges')) ? rowData.jumpbridges : 1,
-            wormholes: (rowData.hasOwnProperty('wormholes')) ? rowData.wormholes : 1,
-            wormholesReduced: (rowData.hasOwnProperty('wormholesReduced')) ? rowData.wormholesReduced : 1,
-            wormholesCritical: (rowData.hasOwnProperty('wormholesCritical')) ? rowData.wormholesCritical : 1
+            stargates: (rowData.hasOwnProperty('stargates')) ? rowData.stargates | 0 : 1,
+            jumpbridges: (rowData.hasOwnProperty('jumpbridges')) ? rowData.jumpbridges | 0 : 1,
+            wormholes: (rowData.hasOwnProperty('wormholes')) ? rowData.wormholes | 0 : 1,
+            wormholesReduced: (rowData.hasOwnProperty('wormholesReduced')) ? rowData.wormholesReduced | 0 : 1,
+            wormholesCritical: (rowData.hasOwnProperty('wormholesCritical')) ? rowData.wormholesCritical | 0 : 1,
+            wormholesEOL: (rowData.hasOwnProperty('wormholesEOL')) ? rowData.wormholesEOL | 0 : 1
         };
     };
 
@@ -243,7 +244,8 @@ define([
                                         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
+                                        wormholesCritical: routeDialogData.hasOwnProperty('wormholesCritical') ? parseInt( routeDialogData.wormholesCritical ) : 0,
+                                        wormholesEOL: routeDialogData.hasOwnProperty('wormholesEOL') ? parseInt( routeDialogData.wormholesEOL ) : 0
                                     }]
                                 };
 
@@ -386,11 +388,13 @@ define([
         var wormholeCheckbox = routeDialog.find('input[type="checkbox"][name="wormholes"]');
         var wormholeReducedCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesReduced"]');
         var wormholeCriticalCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesCritical"]');
+        var wormholeEolCheckbox = routeDialog.find('input[type="checkbox"][name="wormholesEOL"]');
 
         // store current "checked" state for each box ---------------------------------------------
         var storeCheckboxStatus = function(){
             wormholeReducedCheckbox.data('selectState', wormholeReducedCheckbox.prop('checked'));
             wormholeCriticalCheckbox.data('selectState', wormholeCriticalCheckbox.prop('checked'));
+            wormholeEolCheckbox.data('selectState', wormholeEolCheckbox.prop('checked'));
         };
 
         // on wormhole checkbox change ------------------------------------------------------------
@@ -399,9 +403,11 @@ define([
             if( $(this).is(':checked') ){
                 wormholeReducedCheckbox.prop('disabled', false);
                 wormholeCriticalCheckbox.prop('disabled', false);
+                wormholeEolCheckbox.prop('disabled', false);
 
                 wormholeReducedCheckbox.prop('checked', wormholeReducedCheckbox.data('selectState'));
                 wormholeCriticalCheckbox.prop('checked', wormholeCriticalCheckbox.data('selectState'));
+                wormholeEolCheckbox.prop('checked', wormholeEolCheckbox.data('selectState'));
             }else{
                 storeCheckboxStatus();
 
@@ -409,6 +415,8 @@ define([
                 wormholeReducedCheckbox.prop('disabled', true);
                 wormholeCriticalCheckbox.prop('checked', false);
                 wormholeCriticalCheckbox.prop('disabled', true);
+                wormholeEolCheckbox.prop('checked', false);
+                wormholeEolCheckbox.prop('disabled', true);
             }
         }.bind(wormholeCheckbox);
 
@@ -473,6 +481,7 @@ define([
             wormholes: routeData.wormholes,
             wormholesReduced: routeData.wormholesReduced,
             wormholesCritical: routeData.wormholesCritical,
+            wormholesEOL: routeData.wormholesEOL,
             reload: {
                 button: reloadButton
             },
@@ -679,7 +688,8 @@ define([
                                     jumpbridges: rowData.jumpbridges ? 1 : 0,
                                     wormholes: rowData.wormholes ? 1 : 0,
                                     wormholesReduced: rowData.wormholesReduced ? 1 : 0,
-                                    wormholesCritical: rowData.wormholesCritical ? 1 : 0
+                                    wormholesCritical: rowData.wormholesCritical ? 1 : 0,
+                                    wormholesEOL: rowData.wormholesEOL ? 1 : 0
                                 }]
                             };
 
diff --git a/public/templates/dialog/route.html b/public/templates/dialog/route.html
index 47baa68b..7ddbfe14 100644
--- a/public/templates/dialog/route.html
+++ b/public/templates/dialog/route.html
@@ -40,7 +40,6 @@
                         <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include stargate connections">
                             <input id="form_stargates" name="stargates" value="1" type="checkbox" checked>
                             <label for="form_stargates">Stargates</label>
-                            <div class="help-block with-errors"></div>
                         </div>
 
                         <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include jump bridge connections">
@@ -55,12 +54,13 @@
                 <div class="form-group">
                     <label class="col-sm-2 control-label" for="{{mapSelectId}}">Maps</label>
                     <div class="col-sm-10">
-                        <div class="input-group" title="add/remove maps for search">
+                        <div class="input-group">
                             <select id="{{mapSelectId}}" name="mapIds[]" multiple="multiple">
                                 {{#mapSelectOptions}}
                                 <option value="{{id}}" {{#selected}}selected{{/selected}}>{{name}}</option>
                                 {{/mapSelectOptions}}
                             </select>
+                            <span class="help-block with-errors">Set maps from search</span>
                         </div>
                     </div>
                 </div>
@@ -69,6 +69,8 @@
 
         <hr>
 
+        {{! wormhole ----------------------------------------------------------------- }}
+
         <div class="row">
             <div class="col-sm-4">
                 <div class="form-group">
@@ -76,7 +78,6 @@
                         <div class="col-sm-12 col-xs-6 checkbox checkbox-primary" title="include wormhole connections">
                             <input id="form_wormholes" name="wormholes" value="1" type="checkbox" checked>
                             <label for="form_wormholes">Wormholes</label>
-                            <div class="help-block with-errors"></div>
                         </div>
                     </div>
                 </div>
@@ -88,7 +89,6 @@
                         <div class="col-sm-12 col-xs-6 checkbox checkbox-warning checkbox-circle" title="include reduced connections">
                             <input id="form_wormholes_reduced" name="wormholesReduced" value="1" type="checkbox" checked>
                             <label for="form_wormholes_reduced">Stage 1 (reduced)</label>
-                            <div class="help-block with-errors"></div>
                         </div>
                     </div>
                 </div>
@@ -100,13 +100,22 @@
                         <div class="col-sm-12 col-xs-6 checkbox checkbox-danger checkbox-circle" title="include critical connections">
                             <input id="form_wormholes_critical" name="wormholesCritical" value="1" type="checkbox" checked>
                             <label for="form_wormholes_critical">Stage 2 (critical)</label>
-                            <div class="help-block with-errors"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-sm-4 col-sm-offset-8">
+                <div class="form-group">
+                    <div class="col-sm-offset-1 col-sm-11">
+                        <div class="col-sm-12 col-xs-6 checkbox checkbox-danger checkbox-circle" title="include EOL connections">
+                            <input id="form_wormholes_eol" name="wormholesEOL" value="1" type="checkbox" checked>
+                            <label for="form_wormholes_eol">End of life (EOL)</label>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
 
-
     </form>
 </div>
\ No newline at end of file