diff --git a/mozilla/browser/components/places/content/treeView.js b/mozilla/browser/components/places/content/treeView.js
index 059475574a9..3b806644a1e 100644
--- a/mozilla/browser/components/places/content/treeView.js
+++ b/mozilla/browser/components/places/content/treeView.js
@@ -318,7 +318,7 @@ PlacesTreeView.prototype = {
       replaceCount-=1;
 
     // Mark the removees as invisible
-    for (var i = startReplacement; i < replaceCount; i ++)
+    for (var i = 0; i < replaceCount; i ++)
       this._visibleElements[startReplacement + i].viewIndex = -1;
 
     // Building the new list will set the new elements' visible indices.
@@ -735,7 +735,7 @@ PlacesTreeView.prototype = {
 
   set collapseDuplicates(val) {
     if (this._collapseDuplicates == val)
-      return; // no change;
+      return val; // no change;
 
     this._collapseDuplicates = val;
     if (this._tree && this._result)
@@ -916,8 +916,7 @@ PlacesTreeView.prototype = {
     // For consistency, we always return a favicon for non-containers,
     // even if it is just the default one.
     var icon = node.icon || PlacesUtils.favicons.defaultFavicon;
-    if (icon)
-      return icon.spec;
+    return icon ? icon.spec : "";
   },
 
   getProgressMode: function(aRow, aColumn) { },