diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp
index 3a1ce381af..2a5f4f9c54 100644
--- a/android/jni/com/mapswithme/maps/SearchEngine.cpp
+++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp
@@ -82,34 +82,26 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI
   env->ReleaseIntArrayElements(ranges.get(), rawArr, 0);
 
   ms::LatLon ll = ms::LatLon::Zero();
-  string distance;
-  double distanceInMeters = 0.0;
-
   if (result.HasPoint())
-  {
-    auto const center = result.GetFeatureCenter();
-    ll = mercator::ToLatLon(center);
-    if (hasPosition)
-    {
-      distanceInMeters = ms::DistanceOnEarth(lat, lon,
-                                             mercator::YToLat(center.y),
-                                             mercator::XToLon(center.x));
-      distance = measurement_utils::FormatDistance(distanceInMeters);
-    }
-  }
-
-  bool popularityHasHigherPriority = PopularityHasHigherPriority(hasPosition, distanceInMeters);
+    ll = mercator::ToLatLon(result.GetFeatureCenter());
 
   if (result.IsSuggest())
   {
     jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString()));
     jni::TScopedLocalRef suggest(env, jni::ToJavaString(env, result.GetSuggestionString()));
-    jobject ret = env->NewObject(g_resultClass, g_suggestConstructor, name.get(), suggest.get(), ll.m_lat, ll.m_lon, ranges.get());
-    ASSERT(ret, ());
-    return ret;
+    return env->NewObject(g_resultClass, g_suggestConstructor, name.get(), suggest.get(), ll.m_lat, ll.m_lon, ranges.get());
   }
 
-  auto const isFeature = result.GetResultType() == Result::Type::Feature;
+  string distance;
+  double distanceInMeters = 0.0;
+  if (result.HasPoint() && hasPosition)
+  {
+    distanceInMeters = ms::DistanceOnEarth(lat, lon, ll.m_lat, ll.m_lon);
+    distance = measurement_utils::FormatDistance(distanceInMeters);
+  }
+
+  bool const popularityHasHigherPriority = PopularityHasHigherPriority(hasPosition, distanceInMeters);
+  bool const isFeature = result.GetResultType() == Result::Type::Feature;
   jni::TScopedLocalRef featureId(env, usermark_helper::CreateFeatureId(env, isFeature ?
                                                                             result.GetFeatureID() :
                                                                             kEmptyFeatureId));
@@ -137,12 +129,9 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI
                                                       g_popularityConstructor,
                                                       /// @todo Restore when popularity will be available
                                                       0/*static_cast<jint>(result.GetRankingInfo().m_popularity)*/));
-  jobject ret =
-      env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.m_lat, ll.m_lon,
-                     ranges.get(), result.IsHotel(), result.GetStarsCount(), popularity.get());
-  ASSERT(ret, ());
 
-  return ret;
+  return env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.m_lat, ll.m_lon,
+                        ranges.get(), result.IsHotel(), result.GetStarsCount(), popularity.get());
 }
 
 jobjectArray BuildSearchResults(vector<search::ProductInfo> const & productInfo,
diff --git a/android/src/com/mapswithme/maps/search/SearchAdapter.java b/android/src/com/mapswithme/maps/search/SearchAdapter.java
index 0862167911..c0f711bb67 100644
--- a/android/src/com/mapswithme/maps/search/SearchAdapter.java
+++ b/android/src/com/mapswithme/maps/search/SearchAdapter.java
@@ -25,9 +25,6 @@ import com.mapswithme.util.ThemeUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 
-import static com.mapswithme.maps.search.SearchResult.TYPE_RESULT;
-import static com.mapswithme.maps.search.SearchResult.TYPE_SUGGEST;
-
 class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHolder>
 {
   private final SearchFragment mSearchFragment;
@@ -123,7 +120,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @Override
     void processClick(SearchResult result, int order)
     {
-      mSearchFragment.setQuery(result.suggestion);
+      mSearchFragment.setQuery(result.suggestion, result.type == SearchResult.TYPE_PURE_SUGGEST);
     }
   }
 
@@ -296,10 +293,11 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
 
     switch (viewType)
     {
-      case TYPE_SUGGEST:
+      case SearchResult.TYPE_SUGGEST:
+      case SearchResult.TYPE_PURE_SUGGEST:
         return new SuggestViewHolder(inflater.inflate(R.layout.item_search_suggest, parent, false));
 
-      case TYPE_RESULT:
+      case SearchResult.TYPE_RESULT:
         return new ResultViewHolder(inflater.inflate(R.layout.item_search_result, parent, false));
 
       default:
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index 39002dd390..8ad583c5ac 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -288,9 +288,8 @@ public class SearchFragment extends BaseMwmFragment
     updateResultsPlaceholder();
 
     if (mInitialQuery != null)
-    {
-      setQuery(mInitialQuery);
-    }
+      setQuery(mInitialQuery, false);
+
     mToolbarController.activate();
 
     SearchEngine.INSTANCE.addListener(this);
@@ -344,7 +343,7 @@ public class SearchFragment extends BaseMwmFragment
 
   private String getQuery() { return mToolbarController.getQuery(); }
   private boolean isCategory() { return mToolbarController.isCategory(); }
-  void setQuery(String text) { mToolbarController.setQuery(text); }
+  void setQuery(String text, boolean isCategory) { mToolbarController.setQuery(text, isCategory); }
 
   private void readArguments()
   {
diff --git a/android/src/com/mapswithme/maps/search/SearchResult.java b/android/src/com/mapswithme/maps/search/SearchResult.java
index 1eef5fa37a..91c0f02479 100644
--- a/android/src/com/mapswithme/maps/search/SearchResult.java
+++ b/android/src/com/mapswithme/maps/search/SearchResult.java
@@ -10,8 +10,9 @@ import com.mapswithme.maps.bookmarks.data.FeatureId;
 @SuppressWarnings("unused")
 public class SearchResult implements PopularityProvider
 {
-  public static final int TYPE_SUGGEST = 0;
-  public static final int TYPE_RESULT = 1;
+  public static final int TYPE_PURE_SUGGEST = 0;
+  public static final int TYPE_SUGGEST = 1;
+  public static final int TYPE_RESULT = 2;
 
   // Values should match osm::YesNoUnknown enum.
   public static final int OPEN_NOW_UNKNOWN = 0;
@@ -81,7 +82,11 @@ public class SearchResult implements PopularityProvider
     this.stars = 0;
     this.isHotel = false;
     this.description = null;
-    this.type = TYPE_SUGGEST;
+    // Looks like a hack, but it's fine. Otherwise, should make one more ctor and JNI code bloat.
+    if (lat == 0 && lon == 0)
+      this.type = TYPE_PURE_SUGGEST;
+    else
+      this.type = TYPE_SUGGEST;
     this.highlightRanges = highlightRanges;
     mPopularity = Popularity.defaultInstance();
   }
diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm
index 9428b86ab1..8c4cadf252 100644
--- a/iphone/Maps/Core/Search/MWMSearch.mm
+++ b/iphone/Maps/Core/Search/MWMSearch.mm
@@ -174,14 +174,6 @@ using Observers = NSHashTable<Observer>;
   return [MWMSearch manager]->m_productInfo[index];
 }
 
-+ (BOOL)isFeatureAt:(NSUInteger)index in:(std::vector<FeatureID> const &)array {
-  auto const &result = [self resultWithContainerIndex:index];
-  if (result.GetResultType() != search::Result::Type::Feature)
-    return NO;
-  auto const &resultFeatureID = result.GetFeatureID();
-  return std::binary_search(array.begin(), array.end(), resultFeatureID);
-}
-
 + (MWMSearchItemType)resultTypeWithRow:(NSUInteger)row {
   auto itemsIndex = [MWMSearch manager].itemsIndex;
   return [itemsIndex resultTypeWithRow:row];
diff --git a/iphone/Maps/Core/Search/MWMSearchItemType.h b/iphone/Maps/Core/Search/MWMSearchItemType.h
index 77bd68e899..c0466510de 100644
--- a/iphone/Maps/Core/Search/MWMSearchItemType.h
+++ b/iphone/Maps/Core/Search/MWMSearchItemType.h
@@ -1,7 +1,5 @@
 typedef NS_ENUM(NSUInteger, MWMSearchItemType) {
   // Order == priority.
   MWMSearchItemTypeRegular,
-  MWMSearchItemTypeMopub,
-  MWMSearchItemTypeFacebook,
   MWMSearchItemTypeSuggestion
 };
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
index 0ce971bfe1..c3b25ab909 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.mm
@@ -81,28 +81,26 @@ NSString *GetLocalizedTypeName(search::Result const &result) {
     NSAssert(false, @"Invalid reload with outdated SearchIndex");
     return [tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath];
   }
+
   auto const row = indexPath.row;
   auto const containerIndex = [MWMSearch containerIndexWithRow:row];
-  switch ([MWMSearch resultTypeWithRow:row]) {
-    case MWMSearchItemTypeRegular: {
-      auto cell =
-        static_cast<MWMSearchCommonCell *>([tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class]
-                                                                             indexPath:indexPath]);
-      auto const &result = [MWMSearch resultWithContainerIndex:containerIndex];
-      auto const &productInfo = [MWMSearch productInfoWithContainerIndex:containerIndex];
-      auto const typeName = GetLocalizedTypeName(result);
-      [cell config:result productInfo:productInfo
-        localizedTypeName:typeName];
+  auto const & result = [MWMSearch resultWithContainerIndex:containerIndex];
+
+  switch ([MWMSearch resultTypeWithRow:row])
+  {
+    case MWMSearchItemTypeRegular:
+    {
+      auto cell = static_cast<MWMSearchCommonCell *>(
+        [tableView dequeueReusableCellWithCellClass:[MWMSearchCommonCell class] indexPath:indexPath]);
+      auto const & productInfo = [MWMSearch productInfoWithContainerIndex:containerIndex];
+      [cell config:result productInfo:productInfo localizedTypeName:GetLocalizedTypeName(result)];
       return cell;
     }
-    case MWMSearchItemTypeMopub:
-    case MWMSearchItemTypeFacebook: {
-    }
-    case MWMSearchItemTypeSuggestion: {
+    case MWMSearchItemTypeSuggestion:
+    {
       auto cell = static_cast<MWMSearchSuggestionCell *>(
         [tableView dequeueReusableCellWithCellClass:[MWMSearchSuggestionCell class] indexPath:indexPath]);
-      auto const &suggestion = [MWMSearch resultWithContainerIndex:containerIndex];
-      [cell config:suggestion localizedTypeName:@""];
+      [cell config:result localizedTypeName:@""];
       cell.isLastCell = row == [MWMSearch suggestionsCount] - 1;
       return cell;
     }
@@ -115,22 +113,22 @@ NSString *GetLocalizedTypeName(search::Result const &result) {
   id<MWMSearchTableViewProtocol> delegate = self.delegate;
   auto const row = indexPath.row;
   auto const containerIndex = [MWMSearch containerIndexWithRow:row];
-  switch ([MWMSearch resultTypeWithRow:row]) {
-    case MWMSearchItemTypeRegular: {
-      SearchTextField *textField = delegate.searchTextField;
+  auto const & result = [MWMSearch resultWithContainerIndex:containerIndex];
+
+  switch ([MWMSearch resultTypeWithRow:row])
+  {
+    case MWMSearchItemTypeRegular:
+    {
+      SearchTextField const * textField = delegate.searchTextField;
       [MWMSearch saveQuery:textField.text forInputLocale:textField.textInputMode.primaryLanguage];
-      auto const &result = [MWMSearch resultWithContainerIndex:containerIndex];
       [delegate processSearchWithResult:result];
       break;
     }
-    case MWMSearchItemTypeMopub:
-    case MWMSearchItemTypeFacebook:
+    case MWMSearchItemTypeSuggestion:
+    {
+      [delegate searchText:@(result.GetSuggestionString().c_str()) forInputLocale:nil
+              withCategory:result.GetResultType() == search::Result::Type::PureSuggest];
       break;
-    case MWMSearchItemTypeSuggestion: {
-      auto const &suggestion = [MWMSearch resultWithContainerIndex:containerIndex];
-      NSString *suggestionString = @(suggestion.GetSuggestionString().c_str());
-      /// @todo Pass withCategory:YES if we tap on category suggestion (not street or city)?
-      [delegate searchText:suggestionString forInputLocale:nil withCategory:NO];
     }
   }
 }