diff --git a/VERSION b/VERSION
index a1143272..6e9a4b6a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-18 15:35:38) dev
+Version 2.00.0 (2012-07-18 16:03:39) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index b652126e..bdfad8b8 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -7420,7 +7420,9 @@ class Table(dict):
         self._attempt_upload(fields)
         if any(f(fields) for f in self._before_insert): return 0
         ret =  self._db._adapter.insert(self,self._listify(fields))
-        ret and [f(fields,ret) for f in self._after_insert]
+        if ret and self._after_insert:
+            fields = Row(fields)
+            [f(fields,ret) for f in self._after_insert]
         return ret
 
     def validate_and_insert(self,**fields):
diff --git a/gluon/languages.py b/gluon/languages.py
index 8123db67..ec9c9e06 100644
--- a/gluon/languages.py
+++ b/gluon/languages.py
@@ -457,9 +457,7 @@ class lazyT(object):
         return str(self)
 
     def __mod__(self, symbols):
-        return (self.T.apply_filter(self.m, self.s, self.f, self.t) if self.M else
-                self.T.translate(self.m, self.s))
-
+        return lazyT(self.m,symbols,self.T,self.f,self.t,self.M)
 
 class translator(object):
 
diff --git a/gluon/tools.py b/gluon/tools.py
index 16631087..292f13b9 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -4388,15 +4388,19 @@ class Wiki(object):
             Field('title',required=True),
             Field('file','upload',required=True),
             auth.signature,format='%(title)s')
-        """
-        def update_tags(page,db=db):
-            db(db.wiki_tag.wiki_page==page.id).delete()
-            for tags in page.tags.split(','):
+        def update_tags_insert(page,id,db=db):
+            print page
+            for tag in page.tags.split(','):
                 tag = tag.strip().lower()
-                if tag: db.wiki_tag.insert(tag=tag,wiki_page=page.id)
-        db.wiki_page._after_insert.append(update_tags)
-        db.wiki_page._after_update.append(update_tags)
-        """
+                if tag: db.wiki_tag.insert(name=tag,wiki_page=id)
+        def update_tags_update(dbset,page,db=db):
+            page = dbset.select().first()
+            db(db.wiki_tag.wiki_page==page.id).delete()            
+            for tag in page.tags.split(','):
+                tag = tag.strip().lower()
+                if tag: db.wiki_tag.insert(name=tag,wiki_page=page.id)
+        db.wiki_page._after_insert.append(update_tags_insert)
+        db.wiki_page._after_update.append(update_tags_update)
     def __call__(self):
         if self.automenu:
             current.response.menu = self.menu(current.request.controller,