diff --git a/plugins/Factoids.py b/plugins/Factoids.py
index e1efd1ec7..aac26f5cd 100644
--- a/plugins/Factoids.py
+++ b/plugins/Factoids.py
@@ -162,7 +162,7 @@ class Factoids(plugins.ChannelDBHandler, callbacks.Privmsg):
                           LIMIT 20""", key)
         return [t[0] for t in cursor.fetchall()]
 
-    def _replyFactoids(self, irc, key, factoids, number=0, error=False):
+    def _replyFactoids(self, irc, key, factoids, number=0, error=True):
         if factoids:
             if number:
                 try:
@@ -431,7 +431,7 @@ class Factoids(plugins.ChannelDBHandler, callbacks.Privmsg):
             formats.append(glob.translate(self._sqlTrans))
         cursor = db.cursor()
         sql = """SELECT keys.key FROM %s WHERE %s""" % \
-              (tables, ' AND '.join(criteria))
+              (', '.join(tables), ' AND '.join(criteria))
         sql = sql.replace('TARGET', target)
         cursor.execute(sql, formats)
         if cursor.rowcount == 0:
@@ -447,7 +447,7 @@ class Factoids(plugins.ChannelDBHandler, callbacks.Privmsg):
             s = utils.commaAndify(keys)
             irc.reply(s)
 
-        
+
 Class = Factoids
 
 
diff --git a/test/test_Factoids.py b/test/test_Factoids.py
index 28b6c5f88..b99c4cfdf 100644
--- a/test/test_Factoids.py
+++ b/test/test_Factoids.py
@@ -106,6 +106,8 @@ if sqlite is not None:
                               'inkedmn.*strike|strike.*inkedmn')
             self.assertRegexp('factoids search jemfinch',
                               'my primary author')
+            self.assertRegexp('factoids search --values primary author',
+                              'my primary author')
 
         def testWhatisOnNumbers(self):
             self.assertNotError('learn 911 as emergency number')