diff --git a/src/commands/cmdparser.py b/src/commands/cmdparser.py
index aa127bc92e..2bcc982547 100644
--- a/src/commands/cmdparser.py
+++ b/src/commands/cmdparser.py
@@ -116,8 +116,8 @@ def cmdparser(raw_string, cmdset, caller, match_index=None):
 #
 # You can replace these from the settings file by setting the variables
 #
-# SEARCH_AT_RESULTERROR_HANDLER
-# SEARCH_MULTIMATCH_PARSER
+# SEARCH_AT_RESULT
+# SEARCH_AT_MULTIMATCH_INPUT
 #
 # The the replacing functions must have the same inputs and outputs as
 # those in this module.
diff --git a/src/objects/models.py b/src/objects/models.py
index aaf84bedca..b5e1302b77 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -389,9 +389,10 @@ class ObjectDB(TypedObject):
                       equal to searchdata. A special use is to search for
                       "key" here if you want to do a key-search without
                       including aliases.
-        quiet (bool) - don't display default error messages - return multiple
-                      matches as a list and no matches as None. If not
-                      set (default), will echo error messages and return None.
+        quiet (bool) - don't display default error messages - this tells the
+                      search method that the user wants to handle all errors
+                      themselves. It also changes the return value type, see
+                      below.
         exact (bool) - if unset (default) - prefers to match to beginning of
                       string rather than not matching at all. If set, requires
                       exact mathing of entire string.
@@ -405,10 +406,7 @@ class ObjectDB(TypedObject):
                 match:
                     a unique object match
             quiet=True:
-                no match or multimatch:
-                    returns None or list of multi-matches
-                match:
-                    a unique object match
+                returns a list of 0, 1 or more matches
 
         """
         is_string = isinstance(searchdata, basestring)
diff --git a/src/objects/objects.py b/src/objects/objects.py
index 7374a1d4ca..56c50a3a9e 100644
--- a/src/objects/objects.py
+++ b/src/objects/objects.py
@@ -1053,7 +1053,7 @@ class Exit(Object):
                           locks=str(exidbobj.locks),
                           auto_help=False,
                           destination=exidbobj.db_destination,
-                          arg_regex=r"$",
+                          arg_regex=r"^$",
                           is_exit=True,
                           obj=exidbobj)
         # create a cmdset