diff --git a/submodules/LocationUI/BUCK b/submodules/LocationUI/BUCK
index 61819137f2..4f6104431d 100644
--- a/submodules/LocationUI/BUCK
+++ b/submodules/LocationUI/BUCK
@@ -26,6 +26,9 @@ static_library(
         "//submodules/SegmentedControlNode:SegmentedControlNode",
         "//submodules/Geocoding:Geocoding",
         "//submodules/ItemListVenueItem:ItemListVenueItem",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/SearchBarNode:SearchBarNode",
     ],
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/LocationUI/Sources/LocationAnnotation.swift b/submodules/LocationUI/Sources/LocationAnnotation.swift
index 6f4165a504..72e0ca338d 100644
--- a/submodules/LocationUI/Sources/LocationAnnotation.swift
+++ b/submodules/LocationUI/Sources/LocationAnnotation.swift
@@ -114,13 +114,14 @@ class LocationPinAnnotationView: MKAnnotationView {
         
         super.init(annotation: annotation, reuseIdentifier: locationPinReuseIdentifier)
         
-        self.addSubnode(self.smallNode)
-        self.smallNode.addSubnode(self.smallIconNode)
+        self.addSubnode(self.dotNode)
         
         self.addSubnode(self.shadowNode)
         self.shadowNode.addSubnode(self.backgroundNode)
         self.backgroundNode.addSubnode(self.iconNode)
-        self.addSubnode(self.dotNode)
+        
+        self.addSubnode(self.smallNode)
+        self.smallNode.addSubnode(self.smallIconNode)
         
         self.annotation = annotation
     }
diff --git a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
index 583f33e044..ea6f0d14f3 100644
--- a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
+++ b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
@@ -256,7 +256,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode {
         |> reduceLeft(value: nil) { current, updated, emit -> CLLocation? in
             if let current = current {
                 if let updated = updated {
-                    if updated.distance(from: current) > 250 {
+                    if updated.distance(from: current) > 250 || (updated.horizontalAccuracy < 50.0 && updated.horizontalAccuracy < current.horizontalAccuracy) {
                         emit(updated)
                         return updated
                     } else {
@@ -266,7 +266,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode {
                     return current
                 }
             } else {
-                if let updated = updated, updated.horizontalAccuracy > 0.0 && updated.horizontalAccuracy < 50.0 {
+                if let updated = updated, updated.horizontalAccuracy > 0.0 {
                     emit(updated)
                     return updated
                 } else {
diff --git a/submodules/LocationUI/Sources/LocationSearchContainerNode.swift b/submodules/LocationUI/Sources/LocationSearchContainerNode.swift
index dcfd700670..18699b114b 100644
--- a/submodules/LocationUI/Sources/LocationSearchContainerNode.swift
+++ b/submodules/LocationUI/Sources/LocationSearchContainerNode.swift
@@ -10,10 +10,7 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import MergeLists
 import AccountContext
-import SearchUI
-import ChatListSearchItemHeader
 import ItemListVenueItem
-import ContextUI
 import ItemListUI
 import MapKit
 
@@ -44,7 +41,6 @@ private struct LocationSearchEntry: Identifiable, Comparable {
     }
     
     func item(account: Account, presentationData: PresentationData, sendVenue: @escaping (TelegramMediaMap) -> Void) -> ListViewItem {
-//        let header = ChatListSearchItemHeader(type: .contacts, theme: self.theme, strings: self.strings, actionTitle: nil, action: nil)
         let venue = self.venue
         return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: self.venue, sectionId: 0, style: .plain, action: {
             sendVenue(venue)
diff --git a/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift b/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift
index a8d62385d7..4f97b5586d 100644
--- a/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift
+++ b/submodules/LocationUI/Sources/LocationSearchNavigationContentNode.swift
@@ -7,7 +7,6 @@ import TelegramCore
 import SyncCore
 import TelegramPresentationData
 import SearchBarNode
-import LocalizedPeerData
 
 private let searchBarFont = Font.regular(17.0)