diff --git a/map/framework.cpp b/map/framework.cpp
index 18621c9190..c3e767a2da 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -569,6 +569,56 @@ void Framework::FillPointInfoForBookmark(Bookmark const & bmk, place_page::Info
   });
 }
 
+void Framework::FillUserMarkInfo(UserMark const * mark, place_page::Info & outInfo)
+{
+  outInfo.SetSelectedObject(df::SelectionShape::OBJECT_USER_MARK);
+
+  switch (mark->GetMarkType())
+  {
+  case UserMark::Type::API:
+    FillApiMarkInfo(*static_cast<ApiMarkPoint const *>(mark), outInfo);
+    break;
+  case UserMark::Type::BOOKMARK:
+    FillBookmarkInfo(*static_cast<Bookmark const *>(mark), outInfo);
+    break;
+  case UserMark::Type::SEARCH:
+    FillSearchResultInfo(*static_cast<SearchMarkPoint const *>(mark), outInfo);
+    break;
+  case UserMark::Type::ROUTING:
+    FillRouteMarkInfo(*static_cast<RouteMarkPoint const *>(mark), outInfo);
+    break;
+  case UserMark::Type::ROAD_WARNING:
+    FillRoadTypeMarkInfo(*static_cast<RoadWarningMark const *>(mark), outInfo);
+    break;
+  case UserMark::Type::TRACK_INFO:
+  {
+    auto const & infoMark = *static_cast<TrackInfoMark const *>(mark);
+    BuildTrackPlacePage(GetBookmarkManager().GetTrackSelectionInfo(infoMark.GetTrackId()), outInfo);
+    return;
+  }
+  case UserMark::Type::TRACK_SELECTION:
+  {
+    auto const & selMark = *static_cast<TrackSelectionMark const *>(mark);
+    BuildTrackPlacePage(GetBookmarkManager().GetTrackSelectionInfo(selMark.GetTrackId()), outInfo);
+    return;
+  }
+  case UserMark::Type::TRANSIT:
+  {
+    FillTransitMarkInfo(*static_cast<TransitMark const *>(mark), outInfo);
+    break;
+  }
+  case UserMark::Type::SPEED_CAM:
+  {
+    FillSpeedCameraMarkInfo(*static_cast<SpeedCameraMark const *>(mark), outInfo);
+    break;
+  }
+  default:
+    CHECK(false, ("Unexpected user mark type", mark->GetMarkType()));
+  }
+
+  SetPlacePageLocation(outInfo);
+}
+
 void Framework::FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const
 {
   info.SetBookmarkCategoryName(GetBookmarkManager().GetCategoryName(bmk.GetGroupId()));
@@ -795,7 +845,7 @@ void Framework::ShowBookmark(kml::MarkId id)
 {
   auto const * mark = m_bmManager->GetBookmark(id);
   if (mark)
-  ShowBookmark(mark);
+    ShowBookmark(mark);
   else
     ASSERT(false, ("ShowBookmark was called with invalid id", id));
 }
@@ -2122,56 +2172,20 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
 
   if (buildInfo.IsUserMarkMatchingEnabled())
   {
-    UserMark const * mark = FindUserMarkInTapPosition(buildInfo);
-    if (mark != nullptr)
+    UserMark const * mark = nullptr;
+    if (buildInfo.m_userMarkId != kml::kInvalidMarkId)
     {
-      outInfo.SetSelectedObject(df::SelectionShape::OBJECT_USER_MARK);
-      switch (mark->GetMarkType())
-      {
-      case UserMark::Type::API:
-        FillApiMarkInfo(*static_cast<ApiMarkPoint const *>(mark), outInfo);
-        break;
-      case UserMark::Type::BOOKMARK:
-        FillBookmarkInfo(*static_cast<Bookmark const *>(mark), outInfo);
-        break;
-      case UserMark::Type::SEARCH:
-        FillSearchResultInfo(*static_cast<SearchMarkPoint const *>(mark), outInfo);
-        break;
-      case UserMark::Type::ROUTING:
-        FillRouteMarkInfo(*static_cast<RouteMarkPoint const *>(mark), outInfo);
-        break;
-      case UserMark::Type::ROAD_WARNING:
-        FillRoadTypeMarkInfo(*static_cast<RoadWarningMark const *>(mark), outInfo);
-        break;
-      case UserMark::Type::TRACK_INFO:
-      {
-        auto const & infoMark = *static_cast<TrackInfoMark const *>(mark);
-        BuildTrackPlacePage(GetBookmarkManager().GetTrackSelectionInfo(infoMark.GetTrackId()),
-                            outInfo);
-        return outInfo;
-      }
-      case UserMark::Type::TRACK_SELECTION:
-      {
-        auto const & selMark = *static_cast<TrackSelectionMark const *>(mark);
-        BuildTrackPlacePage(GetBookmarkManager().GetTrackSelectionInfo(selMark.GetTrackId()),
-                            outInfo);
-        return outInfo;
-      }
-      case UserMark::Type::TRANSIT:
-      {
-        FillTransitMarkInfo(*static_cast<TransitMark const *>(mark), outInfo);
-        break;
-      }
-      case UserMark::Type::SPEED_CAM:
-      {
-        FillSpeedCameraMarkInfo(*static_cast<SpeedCameraMark const *>(mark), outInfo);
-        break;
-      }
-      default:
-    CHECK(false, ("Unexpected user mark type", mark->GetMarkType()));
-      }
+      auto const & bm = GetBookmarkManager();
+      mark = bm.IsBookmark(buildInfo.m_userMarkId) ? bm.GetBookmark(buildInfo.m_userMarkId) : bm.GetUserMark(buildInfo.m_userMarkId);
+      ASSERT(mark, ("There is no user mark with id", buildInfo.m_userMarkId));
+    }
 
-      SetPlacePageLocation(outInfo);
+    if (!mark)
+      mark = FindUserMarkInTapPosition(buildInfo);
+
+    if (mark)
+    {
+      FillUserMarkInfo(mark, outInfo);
       return outInfo;
     }
   }
@@ -2221,16 +2235,23 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
     // Selection circle should match feature
     FillFeatureInfo(selectedFeature, outInfo);
 
-    if (buildInfo.IsUserMarkMatchingEnabled() && !outInfo.IsBookmark() && !isBuildingSelected)
-    {
-      // Search for a bookmark at POI position instead of tap position
-      auto mark = FindBookMarkInPosition(outInfo.GetMercator());
-      if (mark)
-        FillBookmarkInfo(*static_cast<Bookmark const *>(mark), outInfo);
-    }
-
     if (isBuildingSelected)
-      outInfo.SetMercator(buildInfo.m_mercator); // Move selection circle to tap position inside a building.
+      outInfo.SetMercator(buildInfo.m_mercator);  // Move selection circle to the tap position inside a building.
+    else if (buildInfo.IsUserMarkMatchingEnabled() && !outInfo.IsBookmark())
+    {
+      // Search for a user mark at POI position instead of tap position (an icon or text label was tapped).
+      double constexpr kEps = 1e-7;
+      auto const rect = df::TapInfo::GetPreciseTapRect(outInfo.GetMercator(), kEps);
+      UserMark const * mark = GetBookmarkManager().FindNearestUserMark(
+          [&rect](UserMark::Type) { return rect; },
+          [](UserMark::Type) { return true; });
+      if (mark)
+      {
+        FillUserMarkInfo(mark, outInfo);
+        SetPlacePageLocation(outInfo);
+        return outInfo;
+      }
+    }
   }
   else
   {
@@ -2278,16 +2299,7 @@ Track::TrackSelectionInfo Framework::FindTrackInTapPosition(place_page::BuildInf
 
 UserMark const * Framework::FindUserMarkInTapPosition(place_page::BuildInfo const & buildInfo) const
 {
-  auto const & bm = GetBookmarkManager();
-  if (buildInfo.m_userMarkId != kml::kInvalidMarkId)
-  {
-    auto mark = bm.IsBookmark(buildInfo.m_userMarkId) ? bm.GetBookmark(buildInfo.m_userMarkId)
-                                                      : bm.GetUserMark(buildInfo.m_userMarkId);
-    if (mark != nullptr)
-      return mark;
-  }
-
-  UserMark const * mark = bm.FindNearestUserMark(
+  UserMark const * mark = GetBookmarkManager().FindNearestUserMark(
     [this, &buildInfo](UserMark::Type type)
     {
       double constexpr kEps = 1e-7;
@@ -2309,26 +2321,6 @@ UserMark const * Framework::FindUserMarkInTapPosition(place_page::BuildInfo cons
   return mark;
 }
 
-UserMark const * Framework::FindBookMarkInPosition(m2::PointD const & mercator) const
-{
-  auto const & bm = GetBookmarkManager();
-
-  UserMark const * mark = bm.FindNearestUserMark(
-      [this, &mercator](UserMark::Type type)
-      {
-        if (type == UserMark::Type::BOOKMARK || type == UserMark::Type::TRACK_INFO)
-          return df::TapInfo::GetBookmarkTapRect(mercator, m_currentModelView);
-
-        if (type == UserMark::Type::ROUTING || type == UserMark::Type::ROAD_WARNING)
-          return df::TapInfo::GetRoutingPointTapRect(mercator, m_currentModelView);
-
-        return df::TapInfo::GetDefaultTapRect(mercator, m_currentModelView);
-      },
-      [](UserMark::Type type) { return true; });
-
-  return mark;
-}
-
 void Framework::PredictLocation(double & lat, double & lon, double accuracy,
                                 double bearing, double speed, double elapsedSeconds)
 {
diff --git a/map/framework.hpp b/map/framework.hpp
index 42b15ee202..53ef163860 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -362,7 +362,6 @@ private:
   void BuildTrackPlacePage(Track::TrackSelectionInfo const & trackSelectionInfo, place_page::Info & info);
   Track::TrackSelectionInfo FindTrackInTapPosition(place_page::BuildInfo const & buildInfo) const;
   UserMark const * FindUserMarkInTapPosition(place_page::BuildInfo const & buildInfo) const;
-  UserMark const * FindBookMarkInPosition(m2::PointD const & mercator) const;
   FeatureID FindBuildingAtPoint(m2::PointD const & mercator) const;
 
   void UpdateMinBuildingsTapZoom();
@@ -610,6 +609,8 @@ private:
   void FillPostcodeInfo(std::string const & postcode, m2::PointD const & mercator,
                         place_page::Info & info) const;
 
+  void FillUserMarkInfo(UserMark const * mark, place_page::Info & outInfo);
+
   void FillInfoFromFeatureType(FeatureType & ft, place_page::Info & info) const;
   void FillApiMarkInfo(ApiMarkPoint const & api, place_page::Info & info) const;
   void FillSearchResultInfo(SearchMarkPoint const & smp, place_page::Info & info) const;