Index: /trunk/FACT++/src/gcn.cc
===================================================================
--- /trunk/FACT++/src/gcn.cc	(revision 19588)
+++ /trunk/FACT++/src/gcn.cc	(revision 19589)
@@ -259,18 +259,18 @@
             switch (id)
             {
-            case 60:
-            case 61:
-            case 62:
-
-            case 110:
-            case 111:
-            case 112:
-            case 115:
-                name = GetParamValue(what, "TRIGGER_NUM").toStdString();
-                break;
-
-            case 123:
-                name = GetParamValue(what, "REF_NUM").toStdString();
-                break;
+            // case 60:
+            // case 61:
+            // case 62:
+            // 
+            // case 110:
+            // case 111:
+            // case 112:
+            // case 115:
+            //     name = GetParamValue(what, "TRIGGER_NUM").toStdString();
+            //     break;
+            // 
+            // case 123:
+            //     name = GetParamValue(what, "REF_NUM").toStdString();
+            //     break;
 
             case 125:
@@ -294,4 +294,14 @@
                 }
 
+            case 171:
+            case 173:
+            case 174:
+                {
+                    const string run_id   = GetParamValue(what, "run_id").toStdString();
+                    const string event_id = GetParamValue(what, "event_id").toStdString();
+                    name = run_id+"_"+event_id;
+                    break;
+                }
+
                 // Missing ID
                 // case 51:
@@ -324,5 +334,5 @@
             const string n2 = name2.text().toStdString();
 
-            const bool has_coordinates = n1=="RA" && n2=="Dec" && unit=="deg";
+            const bool has_coordinates = n1=="RA" && n2=="Dec" && unit=="deg" && ra!=0 && dec!=0;
 
             const std::set<int16_t> typelist =
@@ -349,8 +359,8 @@
                 102, // AGILE_GRB_REFINED
 
-                110, // FERMI_GBM_FLT_POS
-                111, // FERMI_GBM_GND_POS
-                112, // FERMI_GBM_LC
-                115, // FERMI_GBM_TRANS
+                // 110, // FERMI_GBM_ALERT [0/0]
+                111, // FERMI_GBM_FLT_POS
+                112, // FERMI_GBM_GND_POS
+                115, // FERMI_GBM_FIN_POS
 
                 123, // FERMI_LAT_TRANS
@@ -503,5 +513,5 @@
                     " fTriggerInserted=Now(),\n"
                     " fNight="+to_string(Time().NightAsInt())+",\n"
-                    " fRunID="+to_string(-rc)+",\n"
+                    " fPacketTypeKey="+to_string(-rc)+",\n"
                     " fTriggerType=8";