diff --git a/collects/drracket/private/main.rkt b/collects/drracket/private/main.rkt
index a594323d22..4f3bbca282 100644
--- a/collects/drracket/private/main.rkt
+++ b/collects/drracket/private/main.rkt
@@ -537,7 +537,7 @@
   ;; preferences initialization
   (drr:set-default 'drracket:multi-file-search:recur? #t boolean?)
   (drr:set-default 'drracket:multi-file-search:filter? #t boolean?)
-  (drr:set-default 'drracket:multi-file-search:filter-regexp "\\.(rkt.?|ss|scm)$" string?)
+  (drr:set-default 'drracket:multi-file-search:filter-regexp "\\.(rkt.?|scrbl|ss|scm)$" string?)
   (drr:set-default 'drracket:multi-file-search:search-string "" string?)
   (drr:set-default 'drracket:multi-file-search:search-type
                            1
diff --git a/collects/drracket/private/multi-file-search.rkt b/collects/drracket/private/multi-file-search.rkt
index 804cc7f408..44f4fbc6ff 100644
--- a/collects/drracket/private/multi-file-search.rkt
+++ b/collects/drracket/private/multi-file-search.rkt
@@ -33,8 +33,9 @@
   ;; these are the available searches
   (define-struct search-type (label make-searcher params))
   
-  ;; search-info = (make-search-info string boolean (union #f regexp) search-type)
-  (define-struct search-info (dir recur? filter searcher))
+  ;; search-info = (make-search-info string boolean (union #f regexp) search-type string)
+  ;; the search-string field is only informative; not used for actual searching
+  (define-struct search-info (dir recur? filter searcher search-string))
   
   ;; search-types : (listof search-type)
   (define search-types
@@ -54,7 +55,9 @@
   ;; thread: eventspace main thread
   ;; opens a window and creates the thread that does the search
   (define (open-search-window search-info)
-    (define frame (make-object search-size-frame% (string-constant mfs-drscheme-multi-file-search)))
+    (define frame (new search-size-frame%
+                       [name (format (string-constant mfs-drscheme-multi-file-search-title)
+                                      (search-info-search-string search-info))]))
     (define panel (make-object saved-vertical-resizable% (send frame get-area-container)))
     (define button-panel (make-object horizontal-panel% (send frame get-area-container)))
     (define open-button (make-object button% (string-constant mfs-open-file) button-panel
@@ -526,7 +529,8 @@
       (send recur-check-box get-value)
       (and (send filter-check-box get-value)
            (regexp (send filter-text-field get-value)))
-      searcher)))
+      searcher
+      (send search-text-field get-value))))
   
   
   ;; do-search : search-info text -> void
diff --git a/collects/string-constants/danish-string-constants.rkt b/collects/string-constants/danish-string-constants.rkt
index a9a58e24bd..a0704a2324 100644
--- a/collects/string-constants/danish-string-constants.rkt
+++ b/collects/string-constants/danish-string-constants.rkt
@@ -487,7 +487,7 @@ please adhere to these guidelines:
   (mfs-recur-over-subdirectories "Rekursivt i undermapper")
   (mfs-regexp-filename-filter "Regexp filnavnsfilter")
   (mfs-search-string "Søgestreng")
-  (mfs-drscheme-multi-file-search "DrRacket - Søgning i flere filer") ;; results window and error message title
+  (mfs-drscheme-multi-file-search "Søgning i flere filer - DrRacket") ;; results window and error message title
   (mfs-not-a-dir "\"~a\" er ikke en mappe")
   (mfs-open-file "Åbn fil")
   (mfs-stop-search "Stop søgning")
diff --git a/collects/string-constants/dutch-string-constants.rkt b/collects/string-constants/dutch-string-constants.rkt
index 1ac0bb16d5..aa7c610a71 100644
--- a/collects/string-constants/dutch-string-constants.rkt
+++ b/collects/string-constants/dutch-string-constants.rkt
@@ -287,7 +287,7 @@
  (mfs-recur-over-subdirectories "Recursief in mappen")
  (mfs-regexp-filename-filter "Regexp filename filter")
  (mfs-search-string "Zoektekst")
- (mfs-drscheme-multi-file-search "DrRacket - Multi File Search") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "Multi File Search - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" is geen map")
  (mfs-open-file "Bestand openen")
  (mfs-stop-search "Stop met zoeken")
diff --git a/collects/string-constants/english-string-constants.rkt b/collects/string-constants/english-string-constants.rkt
index 68a6bf0569..3e6303858f 100644
--- a/collects/string-constants/english-string-constants.rkt
+++ b/collects/string-constants/english-string-constants.rkt
@@ -549,14 +549,15 @@ please adhere to these guidelines:
  (mfs-recur-over-subdirectories "Recur over subdirectories")
  (mfs-regexp-filename-filter "Regexp filename filter")
  (mfs-search-string "Search string")
- (mfs-drscheme-multi-file-search "DrRacket - Multi File Search") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "Multi File Search - DrRacket") ;; error message window title
  (mfs-not-a-dir "\"~a\" is not a directory")
  (mfs-open-file "Open File")
  (mfs-stop-search "Stop Search")
  (mfs-case-sensitive-label "Case sensitive")
  (mfs-no-matches-found "No matches found.")
  (mfs-search-interrupted "Search aborted.")
- 
+ (mfs-drscheme-multi-file-search-title "Multi File Search for \"~a\" - DrRacket") ;; the ~a format specifier is filled in with the search string
+  
  ;;; reverting a file
  (are-you-sure-revert
   "Are you sure that you want to revert this file? This change cannot be undone.")
diff --git a/collects/string-constants/french-string-constants.rkt b/collects/string-constants/french-string-constants.rkt
index b976305859..28c27946cb 100644
--- a/collects/string-constants/french-string-constants.rkt
+++ b/collects/string-constants/french-string-constants.rkt
@@ -539,7 +539,7 @@
   (mfs-recur-over-subdirectories "Récursion dans les sous-répertoires")
   (mfs-regexp-filename-filter "Expression régulière pour filtrer les noms de fichiers")
   (mfs-search-string "Chercher la chaîne de caractères")
-  (mfs-drscheme-multi-file-search "DrRacket - Recherche dans des fichiers multiples") ;; results window and error message title
+  (mfs-drscheme-multi-file-search "Recherche dans des fichiers multiples - DrRacket") ;; results window and error message title
   (mfs-not-a-dir "\"~a\" n'est pas un répertoire")
   (mfs-open-file "Ouvrir le fichier")
   (mfs-stop-search "Stopper la recherche")
diff --git a/collects/string-constants/german-string-constants.rkt b/collects/string-constants/german-string-constants.rkt
index 93d57db639..abc08cd66d 100644
--- a/collects/string-constants/german-string-constants.rkt
+++ b/collects/string-constants/german-string-constants.rkt
@@ -448,7 +448,7 @@
  (mfs-recur-over-subdirectories "In Unterverzeichnisse abtauchen")
  (mfs-regexp-filename-filter "Regulärer Ausdruck Dateinamen-Filter")
  (mfs-search-string "Zeichenkette suchen")
- (mfs-drscheme-multi-file-search "DrRacket - Suche in mehreren Dateien") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "Suche in mehreren Dateien - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" ist kein Verzeichnis")
  (mfs-open-file "Datei öffnen")
  (mfs-stop-search "Suche stoppen")
diff --git a/collects/string-constants/japanese-string-constants.rkt b/collects/string-constants/japanese-string-constants.rkt
index ecf092fc73..ea6329e7ab 100644
--- a/collects/string-constants/japanese-string-constants.rkt
+++ b/collects/string-constants/japanese-string-constants.rkt
@@ -534,7 +534,7 @@ please adhere to these guidelines:
  (mfs-recur-over-subdirectories "サブディレクトリ内を再帰的に検索")
  (mfs-regexp-filename-filter "ファイル名を正規表現でフィルタ")
  (mfs-search-string "検索語")
- (mfs-drscheme-multi-file-search "DrRacket - 複数ファイルからの検索") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "複数ファイルからの検索 - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" はディレクトリではありません")
  (mfs-open-file "ファイルを開く")
  (mfs-stop-search "検索を中止")
diff --git a/collects/string-constants/korean-string-constants.rkt b/collects/string-constants/korean-string-constants.rkt
index c60e4d674f..b25054444f 100644
--- a/collects/string-constants/korean-string-constants.rkt
+++ b/collects/string-constants/korean-string-constants.rkt
@@ -464,7 +464,7 @@
  (mfs-recur-over-subdirectories "하위디렉토리도 검색")
  (mfs-regexp-filename-filter "다음 정규표현식에 맞는 파일")
  (mfs-search-string "찾을 문자열")
- (mfs-drscheme-multi-file-search "DrRacket - 다중 파일 검색") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "다중 파일 검색 - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" 는 디렉토리가 아닙니다")
  (mfs-open-file "파일 열기")
  (mfs-stop-search "검색 중지")
diff --git a/collects/string-constants/portuguese-string-constants.rkt b/collects/string-constants/portuguese-string-constants.rkt
index 32da893194..cf04a382e6 100644
--- a/collects/string-constants/portuguese-string-constants.rkt
+++ b/collects/string-constants/portuguese-string-constants.rkt
@@ -487,7 +487,7 @@ please adhere to these guidelines:
  (mfs-recur-over-subdirectories "Recursão sobre subdirectorias")
  (mfs-regexp-filename-filter "Expressão Regular para filtro do nome do ficheiro")
  (mfs-search-string "String de Procura")
- (mfs-drscheme-multi-file-search "DrRacket - Procura Multi Ficheiro") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "Procura Multi Ficheiro - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" não é um directorio")
  (mfs-open-file "Abrir Ficheiro")
  (mfs-stop-search "Parar Procura")
diff --git a/collects/string-constants/russian-string-constants.rkt b/collects/string-constants/russian-string-constants.rkt
index 18b03a4600..46b5fd8004 100644
--- a/collects/string-constants/russian-string-constants.rkt
+++ b/collects/string-constants/russian-string-constants.rkt
@@ -539,7 +539,7 @@ please adhere to these guidelines:
  (mfs-recur-over-subdirectories "Искать во вложенных каталогах")
  (mfs-regexp-filename-filter "Фильтровать имена файлов по регулярных выражениях")
  (mfs-search-string "Искать строки")
- (mfs-drscheme-multi-file-search "DrRacket - многофайловый поиск") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "многофайловый поиск - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" не каталог")
  (mfs-open-file "Открыть файл")
  (mfs-stop-search "Остановить поиск")
diff --git a/collects/string-constants/simplified-chinese-string-constants.rkt b/collects/string-constants/simplified-chinese-string-constants.rkt
index 0aece53ff4..c0d39b5448 100644
--- a/collects/string-constants/simplified-chinese-string-constants.rkt
+++ b/collects/string-constants/simplified-chinese-string-constants.rkt
@@ -451,7 +451,7 @@
   (mfs-recur-over-subdirectories "包含子目录")
   (mfs-regexp-filename-filter "文件名筛选(正则表达式)")
   (mfs-search-string "查找字符串")
-  (mfs-drscheme-multi-file-search "DrRacket——多文件查找") ;; results window and error message title
+  (mfs-drscheme-multi-file-search "多文件查找——DrRacket") ;; results window and error message title
   (mfs-not-a-dir "\"~a\"不是目录")
   (mfs-open-file "打开文件")
   (mfs-stop-search "停止搜索")
diff --git a/collects/string-constants/spanish-string-constants.rkt b/collects/string-constants/spanish-string-constants.rkt
index e5284948b9..2eda0ca238 100644
--- a/collects/string-constants/spanish-string-constants.rkt
+++ b/collects/string-constants/spanish-string-constants.rkt
@@ -380,7 +380,7 @@
  (mfs-recur-over-subdirectories "Recurrir sobre subdirectorios")
  (mfs-regexp-filename-filter "Filtro de nombres de archivo con expresiones regulares")
  (mfs-search-string "Buscar cadena")
- (mfs-drscheme-multi-file-search "DrRacket - Búsqueda Multi Archivo")
+ (mfs-drscheme-multi-file-search "Búsqueda Multi Archivo  - DrRacket")
  (mfs-not-a-dir "\"~a\" no es un directorio")
  (mfs-open-file "Abrir Archivo")
  (mfs-stop-search "Detener Búsqueda")
diff --git a/collects/string-constants/traditional-chinese-string-constants.rkt b/collects/string-constants/traditional-chinese-string-constants.rkt
index 4048e4097f..82176b6a12 100644
--- a/collects/string-constants/traditional-chinese-string-constants.rkt
+++ b/collects/string-constants/traditional-chinese-string-constants.rkt
@@ -450,7 +450,7 @@
   (mfs-recur-over-subdirectories "包含子目录")
   (mfs-regexp-filename-filter "文件名筛选(正则表达式)")
   (mfs-search-string "查找字符串")
-  (mfs-drscheme-multi-file-search "DrRacket——多文件查找") ;; results window and error message title
+  (mfs-drscheme-multi-file-search "多文件查找——DrRacket") ;; results window and error message title
   (mfs-not-a-dir "\"~a\"不是目录")
   (mfs-open-file "打开文件")
   (mfs-stop-search "停止搜索")
diff --git a/collects/string-constants/ukrainian-string-constants.rkt b/collects/string-constants/ukrainian-string-constants.rkt
index 2bbbd349f4..0dddde3444 100644
--- a/collects/string-constants/ukrainian-string-constants.rkt
+++ b/collects/string-constants/ukrainian-string-constants.rkt
@@ -539,7 +539,7 @@ please adhere to these guidelines:
  (mfs-recur-over-subdirectories "Шукати у вкладених каталогах")
  (mfs-regexp-filename-filter "Фільтрувати імена файлів за регулярними виразами")
  (mfs-search-string "Шукати рядки")
- (mfs-drscheme-multi-file-search "DrRacket - багатофайловый пошук") ;; results window and error message title
+ (mfs-drscheme-multi-file-search "багатофайловый пошук - DrRacket") ;; results window and error message title
  (mfs-not-a-dir "\"~a\" не каталог")
  (mfs-open-file "Відкрити файл")
  (mfs-stop-search "Зупинити пошук")