diff --git a/TelegramCore/Holes.swift b/TelegramCore/Holes.swift
index cfde2b2faf..5f6189a907 100644
--- a/TelegramCore/Holes.swift
+++ b/TelegramCore/Holes.swift
@@ -31,7 +31,7 @@ func fetchMessageHistoryHole(network: Network, postbox: Postbox, hole: MessageHi
         //|> delay(4.0, queue: Queue.concurrentDefaultQueue())
         |> mapToSignal { peer in
             if let inputPeer = apiInputPeer(peer) {
-                let limit = 20
+                let limit = 100
                 
                 let request: Signal<Api.messages.Messages, MTRpcError>
                 if let tagMask = tagMask {
diff --git a/TelegramCore/MultipartFetch.swift b/TelegramCore/MultipartFetch.swift
index 580c42be76..5ce50a263c 100644
--- a/TelegramCore/MultipartFetch.swift
+++ b/TelegramCore/MultipartFetch.swift
@@ -279,7 +279,7 @@ private final class MultipartCdnHashSource {
                         strongSelf.requestMore()
                     }
                 } else {
-                    assertionFailure()
+                    //assertionFailure()
                 }
             }
         }))
diff --git a/TelegramCore/TelegramMediaWebpage.swift b/TelegramCore/TelegramMediaWebpage.swift
index b7d7781904..90240a4cd1 100644
--- a/TelegramCore/TelegramMediaWebpage.swift
+++ b/TelegramCore/TelegramMediaWebpage.swift
@@ -154,6 +154,7 @@ public final class TelegramMediaWebpageLoadedContent: PostboxCoding, Equatable {
 public func ==(lhs: TelegramMediaWebpageLoadedContent, rhs: TelegramMediaWebpageLoadedContent) -> Bool {
     if lhs.url != rhs.url
     || lhs.displayUrl != rhs.displayUrl
+    || lhs.hash != rhs.hash
     || lhs.type != rhs.type
     || lhs.websiteName != rhs.websiteName
     || lhs.title != rhs.title
diff --git a/TelegramCore/WebpagePreview.swift b/TelegramCore/WebpagePreview.swift
index 03d36ac732..0a07da8590 100644
--- a/TelegramCore/WebpagePreview.swift
+++ b/TelegramCore/WebpagePreview.swift
@@ -39,7 +39,7 @@ public func actualizedWebpage(postbox: Postbox, network: Network, webpage: Teleg
                 return .single(.webPageNotModified)
             }
             |> mapToSignal { result -> Signal<TelegramMediaWebpage, NoError> in
-                if let updatedWebpage = telegramMediaWebpageFromApiWebpage(result), case .Loaded = updatedWebpage.content {
+                if let updatedWebpage = telegramMediaWebpageFromApiWebpage(result), case .Loaded = updatedWebpage.content, updatedWebpage.webpageId == webpage.webpageId {
                     return postbox.modify { modifier -> TelegramMediaWebpage in
                         modifier.updateMedia(updatedWebpage.webpageId, update: updatedWebpage)
                         return updatedWebpage