diff --git a/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul b/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul
index c828246a8fb..4767df82c31 100644
--- a/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul
+++ b/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul
@@ -40,7 +40,7 @@
 
 <tree id="bookmarksTree" context="contextual" ref="NC:BookmarksRoot"
    flex="100%" style="height: 100%"
-   datasources="rdf:bookmarks rdf:files rdf:ftp rdf:find rdf:internetsearch" 
+   datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch" 
    ondblclick="return OpenURL(event, event.target.parentNode.parentNode);">
 
   <!-- Commented out until new tree content model and template builder can play nice -->
diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 3691e1cf8a3..4b8691209fa 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -77,7 +77,7 @@ Contributor(s): ______________________________________. -->
     <html:script src="chrome://bookmarks/content/bookmark-popup.js" />
     <tree id="bmpopuptree" context="contextual"
       flex="100%" style="height: 100%"
-      datasources="rdf:bookmarks rdf:files rdf:ftp rdf:find rdf:internetsearch"
+      datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch"
       onclick="return opener.BookmarkPopupSingleClick(window,event.target.parentNode.parentNode);">
   
     <template>
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index eb52f3119b6..881ea671972 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -134,7 +134,7 @@ Contributor(s): ______________________________________. -->
     
     
       <menu accesskey="&bookmarksMenu.accesskey;" value="&bookmarksMenu.label;"
-                           datasources="rdf:bookmarks rdf:files rdf:find rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">
+                           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">
 		<template>
 			<rule iscontainer="true">
 			  <menupopup>
diff --git a/mozilla/suite/common/bookmarks/bm-panel.xul b/mozilla/suite/common/bookmarks/bm-panel.xul
index 35f0a7b6d16..5a946afd7fa 100644
--- a/mozilla/suite/common/bookmarks/bm-panel.xul
+++ b/mozilla/suite/common/bookmarks/bm-panel.xul
@@ -37,7 +37,7 @@
 
     <tree id="bookmarksTree" context="contextual" ref="NC:BookmarksRoot"
           style="height: 100%; width:100%;"
-          datasources="rdf:bookmarks rdf:files rdf:ftp rdf:find rdf:internetsearch" 
+          datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch" 
           ondblclick="return OpenURL(event, event.target.parentNode.parentNode, 'bookmarksTree');">
 
       <template>
diff --git a/mozilla/suite/common/history/history.xul b/mozilla/suite/common/history/history.xul
index 8b9c56580fb..8255ac0bbd0 100644
--- a/mozilla/suite/common/history/history.xul
+++ b/mozilla/suite/common/history/history.xul
@@ -57,7 +57,7 @@
     </menu>
   </menubar>
 
-  <tree rdf:datasources="rdf:history rdf:find"
+  <tree rdf:datasources="rdf:history rdf:localsearch"
         ondblclick="OpenURL(event,event.target.parentNode.parentNode);"
         ref="NC:HistoryRoot"
         style="height:100%;">
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 3691e1cf8a3..4b8691209fa 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -77,7 +77,7 @@ Contributor(s): ______________________________________. -->
     <html:script src="chrome://bookmarks/content/bookmark-popup.js" />
     <tree id="bmpopuptree" context="contextual"
       flex="100%" style="height: 100%"
-      datasources="rdf:bookmarks rdf:files rdf:ftp rdf:find rdf:internetsearch"
+      datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch"
       onclick="return opener.BookmarkPopupSingleClick(window,event.target.parentNode.parentNode);">
   
     <template>
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index eb52f3119b6..881ea671972 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -134,7 +134,7 @@ Contributor(s): ______________________________________. -->
     
     
       <menu accesskey="&bookmarksMenu.accesskey;" value="&bookmarksMenu.label;"
-                           datasources="rdf:bookmarks rdf:files rdf:find rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">
+                           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot">
 		<template>
 			<rule iscontainer="true">
 			  <menupopup>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
index 35f0a7b6d16..5a946afd7fa 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -37,7 +37,7 @@
 
     <tree id="bookmarksTree" context="contextual" ref="NC:BookmarksRoot"
           style="height: 100%; width:100%;"
-          datasources="rdf:bookmarks rdf:files rdf:ftp rdf:find rdf:internetsearch" 
+          datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch" 
           ondblclick="return OpenURL(event, event.target.parentNode.parentNode, 'bookmarksTree');">
 
       <template>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index 05a69f60888..f2c76a246c8 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -73,7 +73,7 @@
 
 <html:div style="width: 100px; height: 100px;" flex="1">
 <tree  id="bookmarksTree" ref="NC:BookmarksRoot" context="contextual"
-       datasources="rdf:bookmarks rdf:files rdf:ftp rdf:find rdf:internetsearch"
+       datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch"
        ondblclick="return OpenURL(event, event.target.parentNode.parentNode, 'bookmarksTree');"
        style="width:100%;height:100%">
 
diff --git a/mozilla/xpfe/components/history/resources/history.xul b/mozilla/xpfe/components/history/resources/history.xul
index 8b9c56580fb..8255ac0bbd0 100644
--- a/mozilla/xpfe/components/history/resources/history.xul
+++ b/mozilla/xpfe/components/history/resources/history.xul
@@ -57,7 +57,7 @@
     </menu>
   </menubar>
 
-  <tree rdf:datasources="rdf:history rdf:find"
+  <tree rdf:datasources="rdf:history rdf:localsearch"
         ondblclick="OpenURL(event,event.target.parentNode.parentNode);"
         ref="NC:HistoryRoot"
         style="height:100%;">
diff --git a/mozilla/xpfe/components/search/resources/findresults.xul b/mozilla/xpfe/components/search/resources/findresults.xul
index f202e3aae81..0aa8c7a1acf 100644
--- a/mozilla/xpfe/components/search/resources/findresults.xul
+++ b/mozilla/xpfe/components/search/resources/findresults.xul
@@ -21,7 +21,7 @@
 
 	<html:script src="shared.js" />
 
-	<tree id="findresultstree" style="height: 100%" flex="100%" datasources="rdf:bookmarks rdf:history rdf:find" ondblclick="return OpenURL(event, event.target.parentNode.parentNode);">
+	<tree id="findresultstree" style="height: 100%" flex="100%" datasources="rdf:bookmarks rdf:history rdf:localsearch" ondblclick="return OpenURL(event, event.target.parentNode.parentNode);">
 		<treecol id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name" sortActive="true" sortDirection="ascending" />
 		<treecol id="URLColumn" rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
 		<treecol id="ShortcutURLColumn" rdf:resource="http://home.netscape.com/NC-rdf#ShortcutURL"/>