diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index 24d386998f7..f78e0c96233 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -1062,7 +1062,7 @@ function RevealSearchPanel()
     {
     	title = url;
     }
-    bmks.AddBookmark(url, title);
+    bmks.AddBookmark(url, title, bmks.BOOKMARK_DEFAULT_TYPE);
   }
 
 // Set up a lame hack to avoid opening two bookmarks.
diff --git a/mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl b/mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl
index b109d07a692..a2d94e730d2 100644
--- a/mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl
+++ b/mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl
@@ -31,9 +31,13 @@
 [scriptable, uuid(a82e9300-e4af-11d2-8fdf-0008c70adc7b)]
 interface nsIBookmarksService : nsISupports
 {
+    const unsigned long	BOOKMARK_DEFAULT_TYPE   = 0;
+    const unsigned long	BOOKMARK_SEARCH_TYPE    = 1;
+    const unsigned long	BOOKMARK_FIND_TYPE      = 2;
+
     void	ReadBookmarks();
     boolean	IsBookmarked(in string aURI);
-    void	AddBookmark(in string aURI, in wstring aTitle);
+    void	AddBookmark(in string aURI, in wstring aTitle, in long bmType);
     void	UpdateBookmarkLastVisitedDate(in string aURL);
     string	FindShortcut(in wstring aName);
 };
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-find.js b/mozilla/xpfe/components/bookmarks/resources/bm-find.js
index 5f00487d3a9..180c0ec1ace 100755
--- a/mozilla/xpfe/components/bookmarks/resources/bm-find.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-find.js
@@ -149,7 +149,7 @@ function saveFind()
 
 	var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService();
 	if (bmks)	bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
-	if (bmks)	bmks.AddBookmark(searchURL, searchTitle);
+	if (bmks)	bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_FIND_TYPE);
 
 	return(true);
 }
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-find.xul b/mozilla/xpfe/components/bookmarks/resources/bm-find.xul
index 4bf2af00081..414e33b6540 100755
--- a/mozilla/xpfe/components/bookmarks/resources/bm-find.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-find.xul
@@ -40,8 +40,8 @@
 	onload="doLoad()" onunload="doUnload()"
 	>
 
-	<html:script src="chrome://global/content/treePopups.js" />
 	<html:script src="chrome://communicator/content/bookmarks/bm-find.js" />
+	<html:script src="chrome://global/content/treePopups.js" />
 
 	<menubar>
 		<menu value="&menu.file.label;">
@@ -100,9 +100,9 @@
 				</menupopup>
 			</menulist>
 
-			<textfield id="findtext" type="text" style="width:10em;" onkeyup="if (event.which == 13) { doFind(); }" />
+			<textfield id="findtext" type="text" style="width:10em;" onkeyup="if (event.which == 13) { return doFind(); }" />
 			<box autostretch="never">
-				<titledbutton value="&search.button.label;" onclick="return doFind();" class="dialog toolbar-non-iconic" />
+				<button value="&search.button.label;" onclick="return doFind();" class="dialog toolbar-non-iconic" />
 			</box>
 			<spring align="horizontal" flex="100%" />
 		</box>
@@ -158,10 +158,18 @@
 
 		<treehead>
 			<treerow id="headRow">
-				<treecell observes="NameColumn" value="&name.label;" resource="http://home.netscape.com/NC-rdf#Name" onclick="return doSort('NameColumn', null);" sortActive="true" sortDirection="ascending" />
-				<treecell observes="URLColumn" value="&url.label;" resource="http://home.netscape.com/NC-rdf#URL" onclick="return doSort('URLColumn', null);" />
-				<treecell observes="ShortcutURLColumn" value="&shortcut.label;" resource="http://home.netscape.com/NC-rdf#ShortcutURL" onclick="return doSort('ShortcutURLColumn', null);" />
-				<treecell observes="DescriptionColumn" value="&description.label;" resource="http://home.netscape.com/NC-rdf#Description" onclick="return doSort('DescriptionColumn', null);" />
+				<treecell class="treecell-header sortDirectionIndicator" observes="NameColumn"
+					value="&name.label;" resource="http://home.netscape.com/NC-rdf#Name"
+					onclick="return doSort('NameColumn', null);" sortActive="true" sortDirection="ascending" />
+				<treecell class="treecell-header sortDirectionIndicator" observes="URLColumn"
+					value="&url.label;" resource="http://home.netscape.com/NC-rdf#URL"
+					onclick="return doSort('URLColumn', null);" />
+				<treecell class="treecell-header sortDirectionIndicator" observes="ShortcutURLColumn"
+					value="&shortcut.label;" resource="http://home.netscape.com/NC-rdf#ShortcutURL"
+					onclick="return doSort('ShortcutURLColumn', null);" />
+				<treecell class="treecell-header sortDirectionIndicator" observes="DescriptionColumn"
+					value="&description.label;" resource="http://home.netscape.com/NC-rdf#Description"
+					onclick="return doSort('DescriptionColumn', null);" />
 
 				<treecell allowevents="true" id="popupCell">
 					<menu>
@@ -178,7 +186,7 @@
 
 	<box align="horizontal">
 		<spring flex="1" />
-		<titledbutton id="SaveSearch" disabled="true" value="&save.button.label;" onclick="return saveFind();" class="dialog toolbar-non-iconic"/>
+		<button id="SaveSearch" disabled="true" value="&save.button.label;" onclick="return saveFind();" class="dialog toolbar-non-iconic"/>
 		<spring flex="1" />
 	</box>
 
diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
index 4b8bc516562..96756cd8005 100644
--- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
+++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
@@ -2747,7 +2747,7 @@ NS_IMPL_QUERY_INTERFACE6(nsBookmarksService,
 
 
 NS_IMETHODIMP
-nsBookmarksService::AddBookmark(const char *aURI, const PRUnichar *aOptionalTitle)
+nsBookmarksService::AddBookmark(const char *aURI, const PRUnichar *aOptionalTitle, PRInt32 bmType)
 {
 	// XXX Constructing a parser object to do this is bad.
 	// We need to factor AddBookmark() into its own little
@@ -2768,10 +2768,12 @@ nsBookmarksService::AddBookmark(const char *aURI, const PRUnichar *aOptionalTitl
 	// figure out where to add the new bookmark
 	nsCOMPtr<nsIRDFResource>	bookmarkType = kNC_NewBookmarkFolder;
 
-	// hack: route "internetsearch:" URLs if necessary
-	if (!nsCRT::strncmp(aURI, "internetsearch:", 15))
+	switch(bmType)
 	{
+		case	BOOKMARK_SEARCH_TYPE:
+		case	BOOKMARK_FIND_TYPE:
 		bookmarkType = kNC_NewSearchFolder;
+		break;
 	}
 
 	nsCOMPtr<nsIRDFResource>	newBookmarkFolder;
diff --git a/mozilla/xpfe/components/remote/src/remoteControl.js b/mozilla/xpfe/components/remote/src/remoteControl.js
index d980b59f1ab..2987d90951b 100644
--- a/mozilla/xpfe/components/remote/src/remoteControl.js
+++ b/mozilla/xpfe/components/remote/src/remoteControl.js
@@ -99,11 +99,11 @@ var browserRemoteControl = {
         if ( !aURL ) return(false);
         if ( aTitle )
         {
-            bookmarkService.AddBookmark(aURL, aTitle);
+            bookmarkService.AddBookmark(aURL, aTitle, bookmarkService.BOOKMARK_DEFAULT_TYPE );
         }
         else
         {
-            bookmarkService.AddBookmark(aURL, null);
+            bookmarkService.AddBookmark(aURL, null, bookmarkService.BOOKMARK_DEFAULT_TYPE);
         }
         return(true);
     }
diff --git a/mozilla/xpfe/components/search/resources/find.js b/mozilla/xpfe/components/search/resources/find.js
index 816f1a9dbd2..7b9903e866a 100644
--- a/mozilla/xpfe/components/search/resources/find.js
+++ b/mozilla/xpfe/components/search/resources/find.js
@@ -87,7 +87,7 @@ function saveSearch()
 
 	var bmks = Components.classes["component://netscape/browser/bookmarks-service"].getService();
 	if (bmks)	bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
-	if (bmks)	bmks.AddBookmark(searchURL, searchTitle);
+	if (bmks)	bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_FIND_TYPE);
 
 	return(true);
 }
diff --git a/mozilla/xpfe/components/search/resources/internet.js b/mozilla/xpfe/components/search/resources/internet.js
index 816cfc0a09a..e341fa15ca8 100644
--- a/mozilla/xpfe/components/search/resources/internet.js
+++ b/mozilla/xpfe/components/search/resources/internet.js
@@ -97,7 +97,7 @@ function saveSearch()
 	if (bmks)	bmks = bmks.QueryInterface(Components.interfaces.nsIBookmarksService);
 
 	var searchTitle = "Search: '" + gText + "' using " + gSites;
-	if (bmks)	bmks.AddBookmark(searchURL, searchTitle);
+	if (bmks)	bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_SEARCH_TYPE);
 
 	return(true);
 }
\ No newline at end of file
diff --git a/mozilla/xpfe/components/search/resources/search-panel.js b/mozilla/xpfe/components/search/resources/search-panel.js
index 4d048fd6e38..1c89f5fe8ce 100644
--- a/mozilla/xpfe/components/search/resources/search-panel.js
+++ b/mozilla/xpfe/components/search/resources/search-panel.js
@@ -999,7 +999,7 @@ function saveSearch()
 	if( !textNode )		return(false);
 
 	var searchTitle = "Search: '" + lastSearchText + "'";	// using " + gSites;
-	if (bmks)	bmks.AddBookmark(lastSearchURI, searchTitle);
+	if (bmks)	bmks.AddBookmark(lastSearchURI, searchTitle, bmks.BOOKMARK_SEARCH_TYPE);
 
 	return(true);
 }
diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
index 11e7702234c..9a8e4f393ab 100755
--- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
+++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
@@ -1579,7 +1579,7 @@ InternetSearchDataSource::addToBookmarks(nsIRDFResource *src)
 			char	*uri = getSearchURI(src);
 			if (uri)
 			{
-				rv = bookmarks->AddBookmark(uri, name );
+				rv = bookmarks->AddBookmark(uri, name, nsIBookmarksService::BOOKMARK_SEARCH_TYPE );
 				Recycle(uri);
 			}
 		}