--- hamster.py	2012-11-09 14:58:13.000000000 +0000
+++ /usr/share/gtg/GTG/plugins/hamster/hamster.py	2013-01-11 19:37:20.055208821 +0000
@@ -69,7 +69,8 @@
                                 for x in self.hamster.GetActivities()])
             if (gtg_title in hamster_activities
                 or gtg_title.replace(",", "") in hamster_activities):
-                    category = "%s" % hamster_activities[gtg_title]
+                    #category = "%s" % hamster_activities[gtg_title]
+		    category = "@%s" % hamster_activities[gtg_title]
 
         if (self.preferences['category'] == 'tag' or
           (self.preferences['category'] == 'auto_tag' and not category)):
@@ -79,10 +80,12 @@
             lower_gtg_tags = set([x.lower() for x in gtg_tags])
             intersection = set(categories.keys()).intersection(lower_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':
@@ -102,11 +105,14 @@
         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))