diff --git a/lib/peer.py b/lib/peer.py
index c4bdcc8..0ea193d 100644
--- a/lib/peer.py
+++ b/lib/peer.py
@@ -39,9 +39,7 @@ class Peer(object):
              # metadata
              'source', 'ip_addr', 'good_ports',
              'last_connect', 'last_try', 'try_count')
-    PORTS = ('ssl_port', 'tcp_port')
-    FEATURES = PORTS + ('pruning', 'server_version',
-                        'protocol_min', 'protocol_max')
+    FEATURES = ('pruning', 'server_version', 'protocol_min', 'protocol_max')
     # This should be set by the application
     DEFAULT_PORTS = {}
 
diff --git a/server/controller.py b/server/controller.py
index a8d4d43..89ba171 100644
--- a/server/controller.py
+++ b/server/controller.py
@@ -513,10 +513,12 @@ class Controller(util.LoggedClass):
                          'Tries', 'Source', 'IP Address')
         for item in data:
             features = item['features']
-            yield fmt.format(item['host'][:30],
+            hostname = item['host']
+            host = features['hosts'][hostname]
+            yield fmt.format(hostname[:30],
                              item['status'],
-                             features['tcp_port'] or '',
-                             features['ssl_port'] or '',
+                             host['tcp_port'] or '',
+                             host['ssl_port'] or '',
                              features['server_version'] or 'unknown',
                              features['protocol_min'],
                              features['protocol_max'],