diff --git a/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp b/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
index 97e1628c993..e63c6bd7f86 100644
--- a/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
@@ -144,7 +144,9 @@ nsNavBookmarks::Init()
   // _item_ children which are in moz_places.
   // Results are kGetInfoIndex_*
   NS_NAMED_LITERAL_CSTRING(selectItemChildren,
-    "SELECT h.id, h.url, a.title, h.user_title, h.rev_host, h.visit_count, "
+    "SELECT h.id, h.url, a.title, "
+      "(SELECT title FROM moz_bookmarks WHERE item_child = h.id), "
+      "h.rev_host, h.visit_count, "
       "(SELECT MAX(visit_date) FROM moz_historyvisits WHERE place_id = h.id), "
       "f.url, null, a.position, a.item_child, a.folder_child, null, a.id "
     "FROM moz_bookmarks a "
diff --git a/mozilla/toolkit/components/places/src/nsNavHistory.cpp b/mozilla/toolkit/components/places/src/nsNavHistory.cpp
index 8b48311b939..06ddf96a3ff 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistory.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavHistory.cpp
@@ -581,7 +581,8 @@ nsNavHistory::InitStatements()
 
   // mDBGetURLPageInfo
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+      "item_child = h.id), h.rev_host, h.visit_count "
       "FROM moz_places h "
       "WHERE h.url = ?1"),
     getter_AddRefs(mDBGetURLPageInfo));
@@ -589,7 +590,8 @@ nsNavHistory::InitStatements()
 
   // mDBGetURLPageInfoFull
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+      "item_child = h.id), h.rev_host, h.visit_count, "
         "(SELECT MAX(visit_date) FROM moz_historyvisits WHERE place_id = h.id), "
         "f.url "
       "FROM moz_places h "
@@ -600,14 +602,16 @@ nsNavHistory::InitStatements()
 
   // mDBGetIdPageInfo
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+      "item_child = h.id), h.rev_host, h.visit_count "
       "FROM moz_places h WHERE h.id = ?1"),
                                 getter_AddRefs(mDBGetIdPageInfo));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // mDBGetIdPageInfoFull
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+        "item_child = h.id), h.rev_host, h.visit_count, "
         "(SELECT MAX(visit_date) FROM moz_historyvisits WHERE place_id = h.id), "
         "f.url "
       "FROM moz_places h "
@@ -672,7 +676,8 @@ nsNavHistory::InitStatements()
 
   // mDBVisitToURLResult, should match kGetInfoIndex_* (see GetQueryResults)
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+        "item_child = h.id), h.rev_host, h.visit_count, "
         "(SELECT MAX(visit_date) FROM moz_historyvisits WHERE place_id = h.id), "
         "f.url, null "
       "FROM moz_places h "
@@ -684,7 +689,8 @@ nsNavHistory::InitStatements()
 
   // mDBVisitToVisitResult, should match kGetInfoIndex_* (see GetQueryResults)
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+             "item_child = h.id), h.rev_host, h.visit_count, "
              "v.visit_date, f.url, v.session "
       "FROM moz_places h "
       "JOIN moz_historyvisits v ON h.id = v.place_id "
@@ -695,7 +701,8 @@ nsNavHistory::InitStatements()
 
   // mDBUrlToURLResult, should match kGetInfoIndex_*
   rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+        "item_child = h.id), h.rev_host, h.visit_count, "
         "(SELECT MAX(visit_date) FROM moz_historyvisits WHERE place_id = h.id), "
         "f.url, null "
       "FROM moz_places h "
@@ -1871,11 +1878,11 @@ nsNavHistory::GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,
     (aOptions->ResultType() == nsINavHistoryQueryOptions::RESULTS_AS_VISIT ||
      aOptions->ResultType() == nsINavHistoryQueryOptions::RESULTS_AS_FULL_VISIT);
 
-  nsCAutoString commonConditions;
+  nsCAutoString commonConditionsForHistory;
 
   if (! aOptions->IncludeHidden()) {
     // The hiding code here must match the notification behavior in AddVisit
-    commonConditions.AssignLiteral("hidden <> 1 ");
+    commonConditionsForHistory.AssignLiteral("hidden <> 1 ");
 
     // Some items are unhidden but are subframe navigations that we shouldn't
     // show. This happens especially on imported profiles because the previous
@@ -1883,7 +1890,7 @@ nsNavHistory::GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,
     // especially Javascript-heavy ones, load things in frames to display them,
     // resulting in a lot of these entries. This filters those visits out.
     if (asVisits)
-      commonConditions.AppendLiteral("AND v.visit_type <> 4 "); // not TRANSITION_EMBED
+      commonConditionsForHistory.AppendLiteral("AND v.visit_type <> 4 "); // not TRANSITION_EMBED
   }
 
   // Query string: Output parameters should be in order of kGetInfoIndex_*
@@ -1898,7 +1905,8 @@ nsNavHistory::GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,
     // between the history and visits table and do our query.
     // FIXME(brettw) Add full visit info
     queryString = NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title from moz_bookmarks WHERE "
+             "item_child = h.id), h.rev_host, h.visit_count, "
              "v.visit_date, f.url, v.session "
       "FROM moz_places h "
       "JOIN moz_historyvisits v ON h.id = v.place_id "
@@ -1911,7 +1919,8 @@ nsNavHistory::GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,
     // session information.
     // FIXME(brettw) add nulls for full visit info
     queryString = NS_LITERAL_CSTRING(
-      "SELECT h.id, h.url, h.title, h.user_title, h.rev_host, h.visit_count, "
+      "SELECT h.id, h.url, h.title, (SELECT title FROM moz_bookmarks WHERE "
+        "item_child = h.id), h.rev_host, h.visit_count, "
         "(SELECT MAX(visit_date) FROM moz_historyvisits WHERE place_id = h.id), "
         "f.url, null "
       "FROM moz_places h "
@@ -1929,7 +1938,8 @@ nsNavHistory::GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,
     PRInt32 clauseParameters = 0;
     rv = QueryToSelectClause(aQueries[i], numParameters,
                              &queryClause, &clauseParameters,
-                             commonConditions);
+                             aQueries[i]->OnlyBookmarked() ? 
+                               EmptyCString() : commonConditionsForHistory);
     NS_ENSURE_SUCCESS(rv, rv);
     if (! queryClause.IsEmpty()) {
       if (! conditions.IsEmpty()) // exists previous clause: multiple ones are ORed
@@ -1945,7 +1955,7 @@ nsNavHistory::GetQueryResults(const nsCOMArray<nsNavHistoryQuery>& aQueries,
   if (! conditions.IsEmpty()) {
     queryString += conditions;
   } else {
-    queryString += commonConditions;
+    queryString += commonConditionsForHistory;
   }
   queryString += groupBy;
 
diff --git a/mozilla/toolkit/components/places/src/nsNavHistoryQuery.h b/mozilla/toolkit/components/places/src/nsNavHistoryQuery.h
index 2c940e6bac7..7e47d262686 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistoryQuery.h
+++ b/mozilla/toolkit/components/places/src/nsNavHistoryQuery.h
@@ -164,7 +164,7 @@ private:
   //  * Add to the serialization code (see nsNavHistory::QueriesToQueryString())
   //  * Add to the deserialization code (see nsNavHistory::QueryStringToQueries)
   //  * Add to the nsNavHistoryQueryOptions::Clone() function
-  //  * Add to the nsNavHistory.cpp::GetSimpleBookmarksQuery function if applicable
+  //  * Add to the nsNavHistory.cpp::GetSimpleBookmarksQueryFolder function if applicable
   PRUint32 mSort;
   PRUint32 mResultType;
   PRUint32 mGroupCount;