diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
index 885546d71e..3acab08869 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuViewController.mm
@@ -1,4 +1,5 @@
 #import "MWMBottomMenuViewController.h"
+#import <Pushwoosh/PushNotificationManager.h>
 #import "Common.h"
 #import "EAGLView.h"
 #import "MWMActivityViewController.h"
@@ -349,6 +350,7 @@ typedef NS_ENUM(NSUInteger, MWMBottomMenuViewCell) {
 - (void)menuActionAddPlace
 {
   [Statistics logEvent:kStatEditorAddClick withParameters:@{kStatValue : kStatMenu}];
+  [[PushNotificationManager pushManager] setTags:@{ @"editor_add_discovered" : @YES }];
   self.state = self.restoreState;
   [self.delegate addPlace:NO hasPoint:NO point:m2::PointD()];
 }
diff --git a/iphone/Maps/Classes/Location/MWMLocationManager.mm b/iphone/Maps/Classes/Location/MWMLocationManager.mm
index 6f3568386a..44bd946f42 100644
--- a/iphone/Maps/Classes/Location/MWMLocationManager.mm
+++ b/iphone/Maps/Classes/Location/MWMLocationManager.mm
@@ -1,4 +1,5 @@
 #import "MWMLocationManager.h"
+#import <Pushwoosh/PushNotificationManager.h>
 #import "Common.h"
 #import "MWMAlertViewController.h"
 #import "MWMController.h"
@@ -507,6 +508,7 @@ void setPermissionRequested()
     setPermissionRequested();
     if ([CLLocationManager headingAvailable])
       [locationManager startUpdatingHeading];
+    [[PushNotificationManager pushManager] startLocationTracking];
   };
   if ([CLLocationManager locationServicesEnabled])
   {
@@ -535,6 +537,7 @@ void setPermissionRequested()
   [locationManager stopUpdatingLocation];
   if ([CLLocationManager headingAvailable])
     [locationManager stopUpdatingHeading];
+  [[PushNotificationManager pushManager] stopLocationTracking];
 }
 
 @end
diff --git a/iphone/Maps/Classes/MWMPlacePageViewManager.mm b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
index cc9f095bc1..d067287ee3 100644
--- a/iphone/Maps/Classes/MWMPlacePageViewManager.mm
+++ b/iphone/Maps/Classes/MWMPlacePageViewManager.mm
@@ -1,4 +1,5 @@
 #import "MWMPlacePageViewManager.h"
+#import <Pushwoosh/PushNotificationManager.h>
 #import "Common.h"
 #import "MWMAPIBar.h"
 #import "MWMActivityViewController.h"
@@ -258,6 +259,7 @@ extern NSString * const kBookmarksChangedNotification;
 - (void)editPlace
 {
   [Statistics logEvent:kStatEventName(kStatPlacePage, kStatEdit)];
+  [[PushNotificationManager pushManager] setTags:@{ @"editor_edit_discovered" : @YES }];
   [(MapViewController *)self.ownerViewController openEditor];
 }
 
diff --git a/iphone/Maps/Classes/Routing/MWMRouter.mm b/iphone/Maps/Classes/Routing/MWMRouter.mm
index 2d8e11b646..bbcc5411bf 100644
--- a/iphone/Maps/Classes/Routing/MWMRouter.mm
+++ b/iphone/Maps/Classes/Routing/MWMRouter.mm
@@ -1,4 +1,5 @@
 #import "MWMRouter.h"
+#import <Pushwoosh/PushNotificationManager.h>
 #import "MWMAlertViewController.h"
 #import "MWMFrameworkListener.h"
 #import "MWMLocationHelpers.h"
@@ -133,6 +134,20 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
   {
     [Statistics logEvent:kStatPointToPoint
           withParameters:@{kStatAction : kStatBuildRoute, kStatValue : kStatPointToPoint}];
+    switch (self.type)
+    {
+    case RouterType::Vehicle:
+      [[PushNotificationManager pushManager] setTags:@{ @"routing_p2p_vehicle_discovered" : @YES }];
+      break;
+    case RouterType::Pedestrian:
+      [[PushNotificationManager pushManager] setTags:@{
+        @"routing_p2p_pedestrian_discovered" : @YES
+      }];
+      break;
+    case RouterType::Bicycle:
+      [[PushNotificationManager pushManager] setTags:@{ @"routing_p2p_bicycle_discovered" : @YES }];
+      break;
+    }
   }
 
   if ([self arePointsValidForRouting])
@@ -146,6 +161,18 @@ bool isMarkerPoint(MWMRoutePoint const & point) { return point.IsValid() && !poi
     f.SetRouteStartPoint(startPoint, isMarkerPoint(self.startPoint));
     f.SetRouteFinishPoint(finishPoint, isMarkerPoint(self.finishPoint));
     [[MWMMapViewControlsManager manager] onRouteRebuild];
+    switch (self.type)
+    {
+    case RouterType::Vehicle:
+      [[PushNotificationManager pushManager] setTags:@{ @"routing_vehicle_discovered" : @YES }];
+      break;
+    case RouterType::Pedestrian:
+      [[PushNotificationManager pushManager] setTags:@{ @"routing_pedestrian_discovered" : @YES }];
+      break;
+    case RouterType::Bicycle:
+      [[PushNotificationManager pushManager] setTags:@{ @"routing_bicycle_discovered" : @YES }];
+      break;
+    }
   }
   else
   {
diff --git a/iphone/Maps/MAPSME.plist b/iphone/Maps/MAPSME.plist
index d0014389f9..11548832cc 100644
--- a/iphone/Maps/MAPSME.plist
+++ b/iphone/Maps/MAPSME.plist
@@ -244,5 +244,7 @@
 			</dict>
 		</dict>
 	</array>
+	<key>PW_USE_GPS</key>
+	<true/>
 </dict>
 </plist>