Index: trunk/FACT++/src/fitsdump.cc
===================================================================
--- trunk/FACT++/src/fitsdump.cc	(revision 18952)
+++ trunk/FACT++/src/fitsdump.cc	(revision 18954)
@@ -128,18 +128,20 @@
 void FitsDumper::List()
 {
-    const fits::Table::Keys    &fKeyMap = GetKeys();
     const fits::Table::Columns &fColMap = GetColumns();
 
+    cout << endl;
+
     cout << "\nFile: " << fFilename << "\n";
 
-    cout << " " << fKeyMap.find("EXTNAME")->second.value << " [";
-    cout << GetNumRows() << "]\n";
-
-    for (auto it = fColMap.begin(); it != fColMap.end(); it++)
-    {
-        cout << "   " << it->first << "[" << it->second.num << "] (" << it->second.unit << ":" << ValueTypeToStr(it->second.type) << ") ";
-        for (auto jt = fKeyMap.begin(); jt != fKeyMap.end(); jt++)
-            if (jt->second.value == it->first)
-                cout << "/ " << jt->second.comment << endl;
+    cout << " "  << Get<std::string>("EXTNAME", "");
+    cout << " [" << GetNumRows() << "]\n";
+
+    for (const auto &it : fColMap)
+    {
+        cout << " " << setw(3)  << it.second.id;
+        cout << "|" << setw(10) << ValueTypeToStr(it.second.type);
+        cout << " " << it.first << "[" << it.second.num << "]";
+        cout << " / " << it.second.comment;
+        cout << " (" << it.second.unit << ")" << endl;
     }