diff --git a/html/includes/common/generic-graph.inc.php b/html/includes/common/generic-graph.inc.php
index c9e2c3182..082418148 100644
--- a/html/includes/common/generic-graph.inc.php
+++ b/html/includes/common/generic-graph.inc.php
@@ -61,9 +61,11 @@ if( defined('show_settings') || empty($widget_settings) ) {
         $common_output[] = '<option disabled></option>';
     }
     $common_output[] = '
-        <option value="transit"'.($widget_settings['graph_type'] == 'transit' ? ' selected' : '').'>Transit</option>
-        <option value="peering"'.($widget_settings['graph_type'] == 'peering' ? ' selected' : '').'>Peering</option>
-        <option value="core"'.($widget_settings['graph_type'] == 'core' ? ' selected' : '').'>Core</option>
+        <option disabled>Port Aggregators:</option>
+        <option value="transit"'.($widget_settings['graph_type'] == 'transit' ? ' selected' : '').'>&nbsp;&nbsp;&nbsp;Transit</option>
+        <option value="peering"'.($widget_settings['graph_type'] == 'peering' ? ' selected' : '').'>&nbsp;&nbsp;&nbsp;Peering</option>
+        <option value="core"'.($widget_settings['graph_type'] == 'core' ? ' selected' : '').'>&nbsp;&nbsp;&nbsp;Core</option>
+        <option value="custom"'.($widget_settings['graph_type'] == 'custom' ? ' selected' : '').'>&nbsp;&nbsp;&nbsp;Custom Descr</option>
       </select>
     </div>
     <div class="col-sm-offset-10 col-sm-2">
@@ -126,6 +128,14 @@ if( defined('show_settings') || empty($widget_settings) ) {
       <input type="text" class="form-control input_'.$unique_id.'_munin" name="graph_munin" placeholder="Munin Plugin" value="'.htmlspecialchars($widget_settings['graph_munin']).'">
     </div>
   </div>
+  <div class="form-group input_'.$unique_id.'" id="input_'.$unique_id.'_custom">
+    <div class="col-sm-2">
+      <label for="graph_munin" class="control-label">Custom Port-Desc: </label>
+    </div>
+    <div class="col-sm-10">
+      <input type="text" class="form-control input_'.$unique_id.'_custom" name="graph_custom" placeholder="i.e. Gateway" value="'.htmlspecialchars($widget_settings['graph_custom']).'">
+    </div>
+  </div>
   <div class="form-group">
     <div class="col-sm-2">
       <button type="submit" class="btn btn-default">Set</button>
@@ -310,7 +320,7 @@ else {
     $widget_settings['title']         = "";
     $type                             = explode('_',$widget_settings['graph_type'],2);
     $type                             = array_shift($type);
-    $widget_settings['graph_'.$type] = json_decode($widget_settings['graph_'.$type],true);
+    $widget_settings['graph_'.$type] = json_decode($widget_settings['graph_'.$type],true)?:$widget_settings['graph_'.$type];
     if ($type == 'device') {
         $widget_settings['title']     = $widget_settings['graph_device']['name']." / ".$widget_settings['graph_type'];
         $param                        = 'device='.$widget_settings['graph_device']['device_id'];
@@ -337,13 +347,21 @@ else {
         $or           = 'OR';
         $type_param[] = $type;
         $type_where .= ') ';
-        foreach (dbFetchRows("SELECT port_id FROM `ports` as I, `devices` AS D WHERE $type_where AND I.device_id = D.device_id ORDER BY I.ifAlias", $type_param) as $port) {
+        foreach (dbFetchRows("SELECT port_id FROM `ports` WHERE $type_where ORDER BY ifAlias", $type_param) as $port) {
             $tmp[] = $port['port_id'];
         }
         $param                        = 'id='.implode(',',$tmp);
         $widget_settings['graph_type']= 'multiport_bits_separate';
         $widget_settings['title']     = 'Overall '.ucfirst($type).' Bits ('.$widget_settings['graph_range'].')';
     }
+    elseif ($type == 'custom') {
+        foreach (dbFetchRows("SELECT port_id FROM `ports` WHERE `port_descr_type` = ? ORDER BY ifAlias", array($widget_settings['graph_custom'])) as $port) {
+            $tmp[] = $port['port_id'];
+        }
+        $param                        = 'id='.implode(',',$tmp);
+        $widget_settings['graph_type']= 'multiport_bits_separate';
+        $widget_settings['title']     = 'Overall '.ucfirst(htmlspecialchars($widget_settings['graph_custom'])).' Bits ('.$widget_settings['graph_range'].')';
+    }
     else {
         $param                        = 'id='.$widget_settings['graph_'.$type][$type.'_id'];
     }