diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 41aeda1ef0..748bfb97f2 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -999,7 +999,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onPoiActivated(final String name, final String type, final String address, final double lat, final double lon,
                              final int[] metaTypes, final String[] metaValues)
   {
-    final MapObject poi = new MapObject.Poi(name, lat, lon, type);
+    final MapObject poi = new MapObject.Poi(name, lat, lon, address);
     poi.addMetadata(metaTypes, metaValues);
     activateMapObject(poi);
   }
diff --git a/iphone/Maps/Classes/MWMPlacePageEntity.mm b/iphone/Maps/Classes/MWMPlacePageEntity.mm
index 9ecc2613fb..8a8779b86b 100644
--- a/iphone/Maps/Classes/MWMPlacePageEntity.mm
+++ b/iphone/Maps/Classes/MWMPlacePageEntity.mm
@@ -136,7 +136,7 @@ using feature::Metadata;
 {
   NSString * const name = @(info.GetPinName().c_str());
   self.title = name.length > 0 ? name : L(@"dropped_pin");
-  self.category = @(info.GetPinType().c_str());
+  self.category = @(info.FormatAddress().c_str());
 
   auto const presentTypes = metadata.GetPresentTypes();
 
diff --git a/map/address_finder.cpp b/map/address_finder.cpp
index e872375de5..01e844ebd9 100644
--- a/map/address_finder.cpp
+++ b/map/address_finder.cpp
@@ -2,6 +2,7 @@
 
 #include "search/categories_holder.hpp"
 #include "search/result.hpp"
+#include "search/reverse_geocoder.hpp"
 
 #include "drape_frontend/visual_params.hpp"
 
@@ -369,29 +370,18 @@ namespace
 
       for (size_t i = 0; i < m_cont.size(); ++i)
       {
-        bool const isStreet = m_checker.IsStreet(m_cont[i].m_types);
-
-        if (info.m_street.empty() && isStreet)
-          info.m_street = m_cont[i].m_name;
-
-        if (info.m_house.empty())
-          info.m_house = m_cont[i].m_house;
-
-        if (info.m_name.empty())
+        /// @todo Make logic better.
+        /// Now we skip linear objects to get only POI's here (don't mix with streets or roads).
+        /// But there are linear types that may be interesting for POI (rivers).
+        if (m_cont[i].m_types.GetGeoType() != feature::GEOM_LINE)
         {
-          /// @todo Make logic better.
-          /// Now we skip linear objects to get only POI's here (don't mix with streets or roads).
-          /// But there are linear types that may be interesting for POI (rivers).
-          if (m_cont[i].m_types.GetGeoType() != feature::GEOM_LINE)
-          {
-            info.m_name = m_cont[i].m_name;
+          info.m_name = m_cont[i].m_name;
 
-            GetReadableTypes(eng, locale, m_cont[i].m_types, info);
-          }
+          GetReadableTypes(eng, locale, m_cont[i].m_types, info);
+
+          if (!info.m_name.empty())
+            break;
         }
-
-        if (!(info.m_street.empty() || info.m_name.empty()))
-          break;
       }
     }
 
@@ -466,32 +456,21 @@ namespace
 
 void Framework::GetAddressInfoForGlobalPoint(m2::PointD const & pt, search::AddressInfo & info) const
 {
-  info.Clear();
+  /// @todo Do not returm MWM's name here.
+  //info.m_country = GetCountryName(pt);
+  //if (info.m_country.empty())
+  //{
+  //  LOG(LINFO, ("Can't find region for point ", pt));
+  //  return;
+  //}
 
-  info.m_country = GetCountryName(pt);
-  if (info.m_country.empty())
-  {
-    LOG(LINFO, ("Can't find region for point ", pt));
-    return;
-  }
+  search::ReverseGeocoder coder(m_model.GetIndex());
+  search::ReverseGeocoder::Address addr;
+  coder.GetNearbyAddress(pt, addr);
+  info.m_house = addr.GetHouseNumber();
+  info.m_street = addr.GetStreetName();
 
-  // use upper scale to get address by point (buildings, streets and POIs are visible).
-  int const scale = scales::GetUpperScale();
-
-  double const addressR[] = {
-    15.0,   // radius to search point POI's
-    100.0,  // radius to search street names
-    5.0     // radius to search building numbers (POI's)
-  };
-
-  // pass maximum value for all addressR
-  m2::RectD const rect = MercatorBounds::RectByCenterXYAndSizeInMeters(pt, addressR[1]);
-  DoGetAddressInfo getAddress(pt, scale, GetChecker(), addressR);
-
-  m_model.ForEachFeature(rect, getAddress, scale);
-  getAddress.FillAddress(m_searchEngine.get(), info);
-
-  // @todo Temporarily commented - it's slow and not used in UI
+  /// @todo Rewrite code to get it from LocalityFinder.
   //GetLocality(pt, info);
 }
 
@@ -499,13 +478,6 @@ void Framework::GetAddressInfo(FeatureType const & ft, m2::PointD const & pt, se
 {
   info.Clear();
 
-  info.m_country = GetCountryName(pt);
-  if (info.m_country.empty())
-  {
-    LOG(LINFO, ("Can't find region for point ", pt));
-    return;
-  }
-
   double const inf = numeric_limits<double>::max();
   double addressR[] = { inf, inf, inf };
 
@@ -514,8 +486,7 @@ void Framework::GetAddressInfo(FeatureType const & ft, m2::PointD const & pt, se
   getAddress(ft);
   getAddress.FillAddress(m_searchEngine.get(), info);
 
-  /// @todo Temporarily commented - it's slow and not used in UI
-  //GetLocality(pt, info);
+  GetAddressInfoForGlobalPoint(pt, info);
 }
 
 void Framework::GetLocality(m2::PointD const & pt, search::AddressInfo & info) const
diff --git a/map/framework.hpp b/map/framework.hpp
index 6df370ff0a..1ef91ba895 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -470,12 +470,15 @@ public:
   /// @param[in] pxPoint Current touch point in device pixel coordinates.
   void GetFeatureTypes(m2::PointD const & pxPoint, vector<string> & types) const;
 
-  /// Get address information for point on map.
+  /// Get address information for the point on map.
+  /// Fill only house number and street name. All other params stay unchanged.
+  //@{
   inline void GetAddressInfoForPixelPoint(m2::PointD const & pxPoint, search::AddressInfo & info) const
   {
     GetAddressInfoForGlobalPoint(PtoG(pxPoint), info);
   }
   void GetAddressInfoForGlobalPoint(m2::PointD const & pt, search::AddressInfo & info) const;
+  //@}
 
 private:
   void GetAddressInfo(FeatureType const & ft, m2::PointD const & pt, search::AddressInfo & info) const;
diff --git a/search/reverse_geocoder.hpp b/search/reverse_geocoder.hpp
index 15c1b21bf4..c957e1c6bf 100644
--- a/search/reverse_geocoder.hpp
+++ b/search/reverse_geocoder.hpp
@@ -15,7 +15,7 @@ namespace search
 
 class ReverseGeocoder
 {
-  Index & m_index;
+  Index const & m_index;
 
   struct Object
   {
@@ -36,7 +36,7 @@ public:
   static double const kLookupRadiusM;
   static m2::RectD GetLookupRect(m2::PointD const & center);
 
-  explicit ReverseGeocoder(Index & index) : m_index(index) {}
+  explicit ReverseGeocoder(Index const & index) : m_index(index) {}
 
   using Street = Object;
 
@@ -62,6 +62,9 @@ public:
   {
     Building m_building;
     Street m_street;
+
+    string GetHouseNumber() const { return m_building.m_name; }
+    string GetStreetName() const { return m_street.m_name; }
   };
 
   void GetNearbyAddress(m2::PointD const & center, Address & addr);