--- a/app/soc/modules/ghop/logic/models/task.py	Sat Nov 14 23:27:03 2009 +0100
+++ b/app/soc/modules/ghop/logic/models/task.py	Sat Nov 14 23:58:20 2009 +0100
@@ -150,6 +150,8 @@
           }
       entity_properties.update(history_property)
 
+    entity = self.tags_service.setTagValuesForEntity(entity, entity_properties)
+
     # call the base logic method to store the updated Task entity
     return super(Logic, self).updateEntityProperties(
         entity, entity_properties, silent=silent, store=store)
@@ -256,12 +258,7 @@
 
     entity = super(Logic, self).updateOrCreateFromFields(properties, silent)
 
-    if entity:
-      if properties.get('task_type'):
-        setattr(entity, 'task_type', properties['task_type'])
-
-      if properties.get('difficulty'):
-        setattr(entity, 'difficulty', properties['difficulty'])
+    self.tags_service.setTagValuesForEntity(entity, properties)
 
     return entity