     override func observeValueForKeyPath(keyPath: String?, ofObject object: AnyObject?, change: [String : AnyObject]?, context: UnsafeMutablePointer<Void>) {
         if let domain = object as? Domain where context == &kvoContext && keyPath == "favicon" {
             domain.removeObserver(self, forKeyPath: "favicon")
-            if let index = domainToIndexPath[domain.url ?? ""], let cell = tableView.cellForRowAtIndexPath(index) {
-                configureCell(cell, atIndexPath: index)
-                domainToIndexPath[domain.url ?? ""] = nil
+            if let url = domain.url, let indexes = faviconlessDomainToIndexPaths[url] {
+                for index in indexes {
+                    if let cell = tableView.cellForRowAtIndexPath(index) {
+                        configureCell(cell, atIndexPath: index)
+                    }
+                }
+                faviconlessDomainToIndexPaths[url] = nil
             }
         }
     }

    private var kvoContext: UInt8 = 1
    var frc: NSFetchedResultsController? = nil

    var domainToIndexPath = [String: NSIndexPath]()

    init() {
        super.init(nibName: nil, bundle: nil)

                    cell.imageView!.setIcon(best, withPlaceholder: FaviconFetcher.defaultFavicon)
                }
            }
        } else if let domain = site.domain {
            addFaviconlessDomain(domain, forIndexPath: indexPath)
        }
    }

