diff --git a/glances/outputs/glances_curses_browser.py b/glances/outputs/glances_curses_browser.py
index 1ae197cf..2300447a 100644
--- a/glances/outputs/glances_curses_browser.py
+++ b/glances/outputs/glances_curses_browser.py
@@ -327,10 +327,15 @@ class GlancesCursesBrowser(_GlancesCurses):
         y += 1
         # Second line (for item/key)
         for k, v in column_def.items():
+            if xc >= screen_x or y >= screen_y or v is None:
+                continue
             k_split = k.split('_')
-            if xc < screen_x and y < screen_y and v is not None:
-                self.term_window.addnstr(y, xc, ' '.join(k_split[1:]).upper(), screen_x - x, self.colors_list['BOLD'])
-                xc += v + self.space_between_column
+            if len(k_split) == 1:
+                header_str = k_split[0]
+            else:
+                header_str = ' '.join(k_split[1:])
+            self.term_window.addnstr(y, xc, header_str.upper(), screen_x - x, self.colors_list['BOLD'])
+            xc += v + self.space_between_column
         y += 1
 
         # If a servers has been deleted from the list...
diff --git a/glances/servers_list.py b/glances/servers_list.py
index 55bf2185..1b9ae992 100644
--- a/glances/servers_list.py
+++ b/glances/servers_list.py
@@ -232,7 +232,9 @@ class GlancesServersList:
         return server
 
     def __get_key(self, column):
-        server_key = column.get('plugin') + '_' + column.get('field')
+        server_key = column.get('plugin')
+        if 'field' in column:
+            server_key += '_' + column.get('field')
         if 'key' in column:
             server_key += '_' + column.get('key')
         return server_key