diff --git a/VERSION b/VERSION
index fd7fc765..dd19eb63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-23 13:19:16) dev
+Version 2.00.0 (2012-08-23 14:33:39) dev
diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py
index a8a709c3..02314221 100644
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -2067,7 +2067,7 @@ class SQLFORM(FORM):
                     selectable(records)
                     redirect(referrer)
         else:
-            htmltable = DIV(T('No records found'))
+            htmltable = DIV(current.T('No records found'))
 
         if csv and nrows:
             export_links =[]
diff --git a/gluon/tools.py b/gluon/tools.py
index 10736178..15776aca 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -4587,7 +4587,6 @@ class Wiki(object):
         elif zero=='_cloud':
             return self.cloud()
 
-
     def first_paragraph(self,page):
         if not self.can_read(page):
             mm = page.body.replace('\r','')
@@ -4600,8 +4599,8 @@ class Wiki(object):
         return body.replace('://HOSTNAME','://%s' % self.host)
     
     def read(self,slug):
-        if slug in '_cloud':
-            return self.cloud()
+        if slug in '_cloud': return self.cloud()
+        elif slug in '_search': return self.search()
         page = self.auth.db.wiki_page(slug=slug)
         if not page:
             redirect(URL(args=('_create',slug)))
@@ -4806,7 +4805,8 @@ class Wiki(object):
                                limitby=limitby))
             if request.extension in ('html','load'):
                 if not pages:
-                    content.append(DIV(T("No results",_class='w2p_wiki_form')))
+                    content.append(DIV(current.T("No results"),
+                                       _class='w2p_wiki_form'))
                 def link(t):
                     return A(t,_href=URL(args='_search',vars=dict(tags=t)))
                 items = [DIV(H3(A(p.title,_href=URL(args=p.slug))),