--- hamster.py	2012-02-08 19:58:45.000000000 +0000
+++ /usr/share/gtg/GTG/plugins/hamster/hamster.py	2013-01-11 13:40:43.227870630 +0000
@@ -71,10 +71,12 @@
             categories = dict([(unicode(x[1]).lower(), unicode(x[1])) for x in self.hamster.GetCategories()])
             intersection = set(categories.keys()).intersection(set([x.lower() for x in gtg_tags]))
             if len(intersection) > 0:
-                category = "%s" % categories[intersection.pop()]
+                #category = "%s" % categories[intersection.pop()]
+		category = "@%s" % categories[intersection.pop()]
             elif len(gtg_tags) > 0:
                 # Force category if not found
-                category = gtg_tags[0]
+                #category = gtg_tags[0]
+		category = "@%s"%gtg_tags[0]
 
         description = ""
         if self.preferences['description'] == 'title':
@@ -92,11 +94,13 @@
         except dbus.exceptions.DBusException:
             # old hamster version, doesn't support tags
             pass
-        tag_str = "".join([" ," + x for x in tag_candidates])
+        #tag_str = "".join([" ," + x for x in tag_candidates])
+        tag_str = "".join([" #" + x for x in tag_candidates])
             
         #print '%s%s,%s%s'%(activity, category, description, tag_str)
-        hamster_id=self.hamster.AddFact(activity, tag_str, 0, 0, category, description)
-        
+        #hamster_id=self.hamster.AddFact(activity, tag_str, 0, 0, category, description)
+	hamster_id=self.hamster.AddFact("%s%s,%s%s"%(activity, category, description, tag_str),time.time(),0)
+
         ids=self.get_hamster_ids(task)
         ids.append(str(hamster_id))
         self.set_hamster_ids(task, ids)