diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 05290f3e16..9a4076cb23 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -146,7 +146,6 @@ const long long LITE_IDL = 431183278L;
 
 - (void)dismissPlacePage
 {
-  [self.containerView.placePage showUserMark:NULL];
   [self.containerView.placePage setState:PlacePageStateHidden animated:YES withCallback:YES];
 }
 
@@ -251,10 +250,14 @@ const long long LITE_IDL = 431183278L;
   m2::PointD pxClicked(point.x * scaleFactor, point.y * scaleFactor);
 
   Framework & f = GetFramework();
-  if (f.HasActiveUserMark() && isLongClick == NO)
+  if (f.HasActiveUserMark() && !isLongClick)
     f.GetBalloonManager().Dismiss();
   else
-    f.GetBalloonManager().OnShowMark(f.GetUserMark(m2::PointD(pxClicked.x, pxClicked.y), isLongClick));
+  {
+    UserMark const * userMark = f.GetUserMark(m2::PointD(pxClicked.x, pxClicked.y), isLongClick);
+    if (userMark)
+      f.GetBalloonManager().OnShowMark(userMark);
+  }
 }
 
 - (void)onSingleTap:(NSValue *)point
diff --git a/iphone/Maps/Classes/PlacePageInfoCell.mm b/iphone/Maps/Classes/PlacePageInfoCell.mm
index e6ab091586..ef7c5edc87 100644
--- a/iphone/Maps/Classes/PlacePageInfoCell.mm
+++ b/iphone/Maps/Classes/PlacePageInfoCell.mm
@@ -79,8 +79,8 @@
 {
   self.pinPoint = point;
   self.addressLabel.text = address;
-  [self updateCoordinates];
   self.distanceLabel.text = [self distance];
+  [self updateCoordinates];
 }
 
 - (void)setColor:(UIColor *)color
@@ -89,7 +89,7 @@
 }
 
 #define ADDRESS_LEFT_SHIFT 19
-#define COORDINATES_RIGHT_SHIFT 48
+#define COORDINATES_RIGHT_SHIFT 42
 #define RIGHT_SHIFT 55
 #define DISTANCE_LEFT_SHIFT 55
 
diff --git a/iphone/Maps/Classes/PlacePageView.mm b/iphone/Maps/Classes/PlacePageView.mm
index 9f638b2916..0a966809d0 100644
--- a/iphone/Maps/Classes/PlacePageView.mm
+++ b/iphone/Maps/Classes/PlacePageView.mm
@@ -41,7 +41,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
 @property (nonatomic) NSString * info;
 @property (nonatomic) NSString * setName;
 
-@property (nonatomic) BOOL titleIsTemporary;
+@property (nonatomic) NSString * temporaryTitle;
 
 @end
 
@@ -606,8 +606,9 @@ typedef NS_ENUM(NSUInteger, CellRow)
   UserMark const * innerMark = [self userMark];
   if ([self isBookmark])
     [self bookmarkActivated:static_cast<Bookmark const *>(innerMark)];
-  else if ([self isMarkOfType:UserMark::API] || [self isMarkOfType:UserMark::POI] || [self isMarkOfType:UserMark::SEARCH])
+  else
     [self userMarkActivated:innerMark];
+
   GetFramework().ActivateUserMark(innerMark);
 }
 
@@ -681,6 +682,7 @@ typedef NS_ENUM(NSUInteger, CellRow)
         _title = [self nonEmptyBmName:[self addressInfo].GetPinName()];
     }
 
+    NSString * droppedPinTitle = NSLocalizedString(@"dropped_pin", nil);
     if (![_title length])
     {
       self.titleIsTemporary = YES;