diff --git a/warden3/warden_server/warden_server.py b/warden3/warden_server/warden_server.py
index 5c94c6ade95b5371c9744ebe463bd9bc43b0ffe1..24cafc34dd8cc83edcafc1a050db598fd46e41b3 100755
--- a/warden3/warden_server/warden_server.py
+++ b/warden3/warden_server/warden_server.py
@@ -633,12 +633,11 @@ class MySQL(ObjectReq):
                 cat_id = self.catmap.get(cat, self.catmap_other)
                 self.query("INSERT INTO event_category_mapping (event_id,category_id) VALUES (%s, %s)", (lastid, cat_id), dml=True)
                 
-            try:
-                tags = event['Node'][0]['Tags']
-            except (KeyError, IndexError):
-                tags = []
-                
-            for tag in tags:
+            nodes = event.get('Node', [])
+            tags = []
+            for node in nodes:
+                tags.extend(node.get('Type', []))
+            for tag in set(tags):
                 tag_id = self.tagmap.get(tag, self.tagmap_other)
                 self.query("INSERT INTO event_tag_mapping (event_id,tag_id) VALUES (%s, %s)", (lastid, tag_id), dml=True)