diff --git a/android/jni/app/organicmaps/SearchEngine.cpp b/android/jni/app/organicmaps/SearchEngine.cpp
index 1096a39e59..72dbb410f7 100644
--- a/android/jni/app/organicmaps/SearchEngine.cpp
+++ b/android/jni/app/organicmaps/SearchEngine.cpp
@@ -287,7 +287,7 @@ extern "C"
 
   JNIEXPORT void JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunInteractiveSearch(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
-      jstring lang, jlong timestamp, jboolean isMapAndTable)
+      jstring lang, jlong timestamp, jboolean isMapAndTable, jboolean hasPosition, jdouble lat, jdouble lon)
   {
     search::ViewportSearchParams vparams{
         jni::ToNativeString(env, bytes),
@@ -310,8 +310,7 @@ extern "C"
           std::move(vparams.m_inputLocale),
           {},   // default timeout
           static_cast<bool>(isCategory),
-          bind(&OnResults, _1, _2, timestamp, isMapAndTable,
-                false /* hasPosition */, 0.0 /* lat */, 0.0 /* lon */)
+          bind(&OnResults, _1, _2, timestamp, isMapAndTable, hasPosition, lat, lon)
       };
 
       if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(eparams)))
diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/src/app/organicmaps/MwmActivity.java
index 9ca5131b9f..5edc39d4ca 100644
--- a/android/src/app/organicmaps/MwmActivity.java
+++ b/android/src/app/organicmaps/MwmActivity.java
@@ -19,7 +19,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -275,11 +274,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mPanelAnimator.show(fragmentClass, args, completionListener);
   }
 
-  public boolean containsFragment(@NonNull Class<? extends Fragment> fragmentClass)
-  {
-    return mIsTabletLayout && getFragment(fragmentClass) != null;
-  }
-
   private void showBookmarks()
   {
     BookmarkCategoriesActivity.start(this);
@@ -287,7 +281,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   public void showHelp()
   {
-    Intent intent = new Intent(requireActivity(), HelpActivity.class);
+    Intent intent = new Intent(this, HelpActivity.class);
     startActivity(intent);
   }
 
@@ -605,12 +599,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  public boolean isMapAttached()
-  {
-    return mMapFragment != null && mMapFragment.isAdded();
-  }
-
-
   private void initNavigationButtons()
   {
     initNavigationButtons(mCurrentLayoutMode);
@@ -889,12 +877,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (resultCode != Activity.RESULT_OK)
       return;
 
-    switch (requestCode)
-    {
-      case REQ_CODE_DRIVING_OPTIONS:
-        rebuildLastRoute();
-        break;
-    }
+    if (requestCode == REQ_CODE_DRIVING_OPTIONS)
+      rebuildLastRoute();
   }
 
   private void rebuildLastRoute()
@@ -1247,13 +1231,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mMapFragment.updateMyPositionRoutingOffset(offsetY);
   }
 
-  @Override
-  @NonNull
-  public AppCompatActivity requireActivity()
-  {
-    return this;
-  }
-
   @Override
   public void showSearch()
   {
@@ -1468,7 +1445,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void showNavigation(boolean show)
   {
     // TODO:
-//    mPlacePage.refreshViews();
+    // mPlacePage.refreshViews();
     mNavigationController.show(show);
     if (mOnmapDownloader != null)
       mOnmapDownloader.updateState(false);
@@ -1603,6 +1580,52 @@ public class MwmActivity extends BaseMwmFragmentActivity
         .show();
   }
 
+  @Override
+  public void onShowDisclaimer()
+  {
+    final StringBuilder builder = new StringBuilder();
+    for (int resId : new int[] { R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision,
+        R.string.dialog_routing_disclaimer_recommendations, R.string.dialog_routing_disclaimer_borders,
+        R.string.dialog_routing_disclaimer_beware })
+      builder.append(MwmApplication.from(this).getString(resId)).append("\n\n");
+
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        .setTitle(R.string.dialog_routing_disclaimer_title)
+        .setMessage(builder.toString())
+        .setCancelable(false)
+        .setNegativeButton(R.string.decline, null)
+        .setPositiveButton(R.string.accept, (dlg, which) -> {
+          Config.acceptRoutingDisclaimer();
+          RoutingController.get().prepare();
+        })
+        .show();
+  }
+
+  @Override
+  public void onSuggestRebuildRoute()
+  {
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+        .setMessage(R.string.p2p_reroute_from_current)
+        .setCancelable(false)
+        .setNegativeButton(R.string.cancel, null);
+
+    final TextView titleView = (TextView)View.inflate(this, R.layout.dialog_suggest_reroute_title, null);
+    titleView.setText(R.string.p2p_only_from_current);
+    builder.setCustomTitle(titleView);
+
+    if (MapObject.isOfType(MapObject.MY_POSITION, RoutingController.get().getEndPoint()))
+      builder.setPositiveButton(R.string.ok, (dialog, which) -> RoutingController.get().swapPoints());
+    else
+    {
+      if (LocationHelper.INSTANCE.getMyPosition() == null)
+        builder.setMessage(null).setNegativeButton(null, null);
+
+      builder.setPositiveButton(R.string.ok, (dialog, which) -> RoutingController.get().setStartFromMyPosition());
+    }
+
+    builder.show();
+  }
+
   @Override
   public void onMyPositionModeChanged(int newMode)
   {
@@ -1772,9 +1795,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   public void onSettingsOptionSelected()
   {
-    Intent intent = new Intent(requireActivity(), SettingsActivity.class);
+    Intent intent = new Intent(this, SettingsActivity.class);
     closeFloatingPanels();
-    requireActivity().startActivity(intent);
+    startActivity(intent);
   }
 
   public void onShareLocationOptionSelected()
diff --git a/android/src/app/organicmaps/bookmarks/data/MapObject.java b/android/src/app/organicmaps/bookmarks/data/MapObject.java
index aaf779a95a..b1bcc04c98 100644
--- a/android/src/app/organicmaps/bookmarks/data/MapObject.java
+++ b/android/src/app/organicmaps/bookmarks/data/MapObject.java
@@ -265,7 +265,7 @@ public class MapObject implements PopularityProvider, PlacePageData
 
   public boolean hasMetadata()
   {
-    return !mMetadata.isEmpty();
+    return mMetadata != null && !mMetadata.isEmpty();
   }
 
   @MapObjectType
diff --git a/android/src/app/organicmaps/routing/RoutingController.java b/android/src/app/organicmaps/routing/RoutingController.java
index 37b05471b5..7a4e0498f2 100644
--- a/android/src/app/organicmaps/routing/RoutingController.java
+++ b/android/src/app/organicmaps/routing/RoutingController.java
@@ -1,23 +1,17 @@
 package app.organicmaps.routing;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.view.View;
-import android.widget.TextView;
 
 import androidx.annotation.DimenRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.core.util.Pair;
-import androidx.fragment.app.FragmentActivity;
 
 import app.organicmaps.Framework;
-import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.Initializable;
 import app.organicmaps.bookmarks.data.FeatureId;
@@ -29,7 +23,6 @@ import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.concurrency.UiThread;
 import app.organicmaps.util.log.Logger;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
@@ -47,7 +40,7 @@ public class RoutingController implements Initializable<Void>
     NAVIGATION
   }
 
-  enum BuildState
+  public enum BuildState
   {
     NONE,
     BUILDING,
@@ -57,30 +50,31 @@ public class RoutingController implements Initializable<Void>
 
   public interface Container
   {
-    FragmentActivity requireActivity();
-    void showSearch();
-    void showRoutePlan(boolean show, @Nullable Runnable completionListener);
-    void showNavigation(boolean show);
-    void showDownloader(boolean openDownloaded);
-    void updateMenu();
-    void onNavigationCancelled();
-    void onNavigationStarted();
-    void onPlanningCancelled();
-    void onPlanningStarted();
-    void onAddedStop();
-    void onRemovedStop();
-    void onResetToPlanningState();
-    void onBuiltRoute();
-    void onDrivingOptionsWarning();
-    boolean isSubwayEnabled();
-    void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps);
-    void onDrivingOptionsBuildError();
+    default void showSearch() {}
+    default void showRoutePlan(boolean show, @Nullable Runnable completionListener) {}
+    default void showNavigation(boolean show) {}
+    default void showDownloader(boolean openDownloaded) {}
+    default void updateMenu() {}
+    default void onNavigationCancelled() {}
+    default void onNavigationStarted() {}
+    default void onPlanningCancelled() {}
+    default void onPlanningStarted() {}
+    default void onAddedStop() {}
+    default void onRemovedStop() {}
+    default void onResetToPlanningState() {}
+    default void onBuiltRoute() {}
+    default void onDrivingOptionsWarning() {}
+    default boolean isSubwayEnabled() { return false; }
+    default void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps) {}
+    default void onDrivingOptionsBuildError() {}
+    default void onShowDisclaimer() {}
+    default void onSuggestRebuildRoute() {}
 
     /**
      * @param progress progress to be displayed.
      * */
-    void updateBuildProgress(@IntRange(from = 0, to = 100) int progress, @Framework.RouterType int router);
-    void onStartRouteBuilding();
+    default void updateBuildProgress(@IntRange(from = 0, to = 100) int progress, @Framework.RouterType int router) {}
+    default void onStartRouteBuilding() {}
   }
 
   private static final int NO_WAITING_POI_PICK = -1;
@@ -170,7 +164,7 @@ public class RoutingController implements Initializable<Void>
   private final Framework.RoutingLoadPointsListener mRoutingLoadPointsListener =
     success -> {
       if (success)
-        prepare(getStartPoint(), getEndPoint());
+        prepare();
     };
 
   public static RoutingController get()
@@ -331,31 +325,6 @@ public class RoutingController implements Initializable<Void>
     Framework.nativeBuildRoute();
   }
 
-  private void showDisclaimer(final MapObject startPoint, final MapObject endPoint,
-                              final boolean fromApi)
-  {
-    if (mContainer == null)
-      return;
-
-    FragmentActivity activity = mContainer.requireActivity();
-    StringBuilder builder = new StringBuilder();
-    for (int resId : new int[] { R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision,
-                                 R.string.dialog_routing_disclaimer_recommendations, R.string.dialog_routing_disclaimer_borders,
-                                 R.string.dialog_routing_disclaimer_beware })
-      builder.append(MwmApplication.from(activity.getApplicationContext()).getString(resId)).append("\n\n");
-
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
-        .setTitle(R.string.dialog_routing_disclaimer_title)
-        .setMessage(builder.toString())
-        .setCancelable(false)
-        .setNegativeButton(R.string.decline, null)
-        .setPositiveButton(R.string.accept, (dlg, which) -> {
-          Config.acceptRoutingDisclaimer();
-          prepare(startPoint, endPoint, fromApi);
-        })
-        .show();
-  }
-
   public void restoreRoute()
   {
     Framework.nativeLoadRoutePoints();
@@ -384,6 +353,11 @@ public class RoutingController implements Initializable<Void>
     prepare(getStartPoint(), getEndPoint(), false);
   }
 
+  public void prepare()
+  {
+    prepare(getStartPoint(), getEndPoint());
+  }
+
   public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint)
   {
     prepare(startPoint, endPoint, false);
@@ -395,12 +369,13 @@ public class RoutingController implements Initializable<Void>
 
     if (!Config.isRoutingDisclaimerAccepted())
     {
-      showDisclaimer(startPoint, endPoint, fromApi);
+      if (mContainer != null)
+        mContainer.onShowDisclaimer();
       return;
     }
 
     initLastRouteType(startPoint, endPoint, fromApi);
-    prepare(startPoint, endPoint, mLastRouterType, fromApi);
+    prepare(startPoint, endPoint, mLastRouterType);
   }
 
   private void initLastRouteType(@Nullable MapObject startPoint, @Nullable MapObject endPoint,
@@ -424,12 +399,6 @@ public class RoutingController implements Initializable<Void>
 
   public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint,
                       @Framework.RouterType int routerType)
-  {
-    prepare(startPoint, endPoint, routerType, false);
-  }
-
-  public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint,
-                      @Framework.RouterType int routerType, boolean fromApi)
   {
     cancel();
     setState(State.PREPARE);
@@ -455,7 +424,8 @@ public class RoutingController implements Initializable<Void>
 
     if (my == null || !MapObject.isOfType(MapObject.MY_POSITION, getStartPoint()))
     {
-      suggestRebuildRoute();
+      if (mContainer != null)
+        mContainer.onSuggestRebuildRoute();
       return;
     }
 
@@ -511,11 +481,6 @@ public class RoutingController implements Initializable<Void>
     return false;
   }
 
-  private void removeIntermediatePoints()
-  {
-    Framework.nativeRemoveIntermediateRoutePoints();
-  }
-
   @NonNull
   private MapObject toMapObject(@NonNull RouteMarkData point)
   {
@@ -534,49 +499,6 @@ public class RoutingController implements Initializable<Void>
     return mapObject.getRoutePointInfo() != null;
   }
 
-  private void suggestRebuildRoute()
-  {
-    if (mContainer == null)
-      return;
-
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(mContainer.requireActivity())
-        .setMessage(R.string.p2p_reroute_from_current)
-        .setCancelable(false)
-        .setNegativeButton(R.string.cancel, null);
-
-    TextView titleView = (TextView)View.inflate(mContainer.requireActivity(), R.layout.dialog_suggest_reroute_title, null);
-    titleView.setText(R.string.p2p_only_from_current);
-    builder.setCustomTitle(titleView);
-
-    if (MapObject.isOfType(MapObject.MY_POSITION, getEndPoint()))
-    {
-      builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
-      {
-        @Override
-        public void onClick(DialogInterface dialog, int which)
-        {
-          swapPoints();
-        }
-      });
-    }
-    else
-    {
-      if (LocationHelper.INSTANCE.getMyPosition() == null)
-        builder.setMessage(null).setNegativeButton(null, null);
-
-      builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
-      {
-        @Override
-        public void onClick(DialogInterface dialog, int which)
-        {
-          setStartFromMyPosition();
-        }
-      });
-    }
-
-    builder.show();
-  }
-
   private void updatePlan()
   {
     updateProgress();
@@ -676,12 +598,12 @@ public class RoutingController implements Initializable<Void>
     return mState == State.PREPARE;
   }
 
-  boolean isTransitType()
+  public boolean isTransitType()
   {
     return mLastRouterType == Framework.ROUTER_TYPE_TRANSIT;
   }
 
-  boolean isVehicleRouterType()
+  public boolean isVehicleRouterType()
   {
     return mLastRouterType == Framework.ROUTER_TYPE_VEHICLE;
   }
@@ -720,7 +642,7 @@ public class RoutingController implements Initializable<Void>
     return mWaitingPoiPickType != NO_WAITING_POI_PICK;
   }
 
-  BuildState getBuildState()
+  public BuildState getBuildState()
   {
     return mBuildState;
   }
@@ -771,13 +693,13 @@ public class RoutingController implements Initializable<Void>
   }
 
   @Nullable
-  RoutingInfo getCachedRoutingInfo()
+  public RoutingInfo getCachedRoutingInfo()
   {
     return mCachedRoutingInfo;
   }
 
   @Nullable
-  TransitRouteInfo getCachedTransitInfo()
+  public TransitRouteInfo getCachedTransitInfo()
   {
     return mCachedTransitRouteInfo;
   }
@@ -801,7 +723,7 @@ public class RoutingController implements Initializable<Void>
       mContainer.updateMenu();
   }
 
-  void checkAndBuildRoute()
+  public void checkAndBuildRoute()
   {
     if (isWaitingPoiPick())
       showRoutePlan();
@@ -810,7 +732,7 @@ public class RoutingController implements Initializable<Void>
       build();
   }
 
-  private boolean setStartFromMyPosition()
+  public boolean setStartFromMyPosition()
   {
     Logger.d(TAG, "setStartFromMyPosition");
 
@@ -958,7 +880,7 @@ public class RoutingController implements Initializable<Void>
     return new Pair<>(title, subtitle);
   }
 
-  private void swapPoints()
+  public void swapPoints()
   {
     Logger.d(TAG, "swapPoints");
 
diff --git a/android/src/app/organicmaps/search/NativeSearchListener.java b/android/src/app/organicmaps/search/NativeSearchListener.java
index f90e41038a..01ddde1c14 100644
--- a/android/src/app/organicmaps/search/NativeSearchListener.java
+++ b/android/src/app/organicmaps/search/NativeSearchListener.java
@@ -12,10 +12,10 @@ public interface NativeSearchListener
    * @param results Search results.
    * @param timestamp Timestamp of search request.
    */
-  void onResultsUpdate(@NonNull SearchResult[] results, long timestamp);
+  default void onResultsUpdate(@NonNull SearchResult[] results, long timestamp) {}
 
   /**
    * @param timestamp Timestamp of search request.
    */
-  void onResultsEnd(long timestamp);
+  default void onResultsEnd(long timestamp) {}
 }
diff --git a/android/src/app/organicmaps/search/SearchAdapter.java b/android/src/app/organicmaps/search/SearchAdapter.java
index 36497b536f..050e7f37d0 100644
--- a/android/src/app/organicmaps/search/SearchAdapter.java
+++ b/android/src/app/organicmaps/search/SearchAdapter.java
@@ -2,18 +2,11 @@ package app.organicmaps.search;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
@@ -23,7 +16,6 @@ import app.organicmaps.R;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.Utils;
 
 class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHolder>
 {
@@ -64,34 +56,10 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     {
       mResult = result;
       mOrder = order;
-      TextView titleView = getTitleView();
-
-      String title = mResult.name;
-      if (TextUtils.isEmpty(title))
-      {
-        SearchResult.Description description = mResult.description;
-        title = description != null
-                ? Utils.getLocalizedFeatureType(titleView.getContext(), description.featureType)
-                : "";
-      }
-
-      SpannableStringBuilder builder = new SpannableStringBuilder(title);
-      if (mResult.highlightRanges != null)
-      {
-        final int size = mResult.highlightRanges.length / 2;
-        int index = 0;
-
-        for (int i = 0; i < size; i++)
-        {
-          final int start = mResult.highlightRanges[index++];
-          final int len = mResult.highlightRanges[index++];
-
-          builder.setSpan(new StyleSpan(Typeface.BOLD), start, start + len, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        }
-      }
+      final TextView titleView = getTitleView();
 
       if (titleView != null)
-        titleView.setText(builder);
+        titleView.setText(mResult.getFormattedTitle(titleView.getContext()));
     }
 
     @AttrRes int getTintAttr()
@@ -145,53 +113,6 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
       return 0;
     }
 
-    // FIXME: Better format based on result type
-    private CharSequence formatDescription(SearchResult result)
-    {
-      String localizedType = Utils.getLocalizedFeatureType(mFrame.getContext(),
-                                                           result.description.featureType);
-      final SpannableStringBuilder res = new SpannableStringBuilder(localizedType);
-      final SpannableStringBuilder tail = new SpannableStringBuilder();
-
-      if (!TextUtils.isEmpty(result.description.airportIata))
-      {
-        tail.append(" • ").append(result.description.airportIata);
-      }
-      else if (!TextUtils.isEmpty(result.description.roadShields))
-      {
-        tail.append(" • ").append(result.description.roadShields);
-      }
-      else
-      {
-        if (!TextUtils.isEmpty(result.description.brand))
-        {
-          tail.append(" • ").append(Utils.getLocalizedBrand(mFrame.getContext(), result.description.brand));
-        }
-        if (!TextUtils.isEmpty(result.description.cuisine))
-        {
-          tail.append(" • ").append(result.description.cuisine);
-        }
-      }
-
-      if (result.isHotel && result.stars != 0)
-      {
-        tail.append(" • ").append("★★★★★★★".substring(0, Math.min(7, result.stars)));
-      }
-
-      res.append(tail);
-
-      return res;
-    }
-
-    @NonNull
-    private CharSequence colorizeString(@NonNull String str, @ColorInt int color)
-    {
-      final SpannableStringBuilder sb = new SpannableStringBuilder(str);
-      sb.setSpan(new ForegroundColorSpan(color),
-                 0, sb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
-      return sb;
-    }
-
     ResultViewHolder(@NonNull View view)
     {
       super(view);
@@ -216,7 +137,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
       setBackground();
 
       formatOpeningHours(mResult);
-      UiUtils.setTextAndHideIfEmpty(mDescription, formatDescription(mResult));
+      UiUtils.setTextAndHideIfEmpty(mDescription, mResult.getFormattedDescription(mFrame.getContext()));
       UiUtils.setTextAndHideIfEmpty(mRegion, mResult.description.region);
       UiUtils.setTextAndHideIfEmpty(mDistance, mResult.description.distance);
     }
@@ -286,6 +207,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     mSearchFragment = fragment;
   }
 
+  @NonNull
   @Override
   public SearchDataViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
   {
diff --git a/android/src/app/organicmaps/search/SearchEngine.java b/android/src/app/organicmaps/search/SearchEngine.java
index 65510c9626..acb40a1eb5 100644
--- a/android/src/app/organicmaps/search/SearchEngine.java
+++ b/android/src/app/organicmaps/search/SearchEngine.java
@@ -130,17 +130,24 @@ public enum SearchEngine implements NativeSearchListener,
 
   @MainThread
   public void searchInteractive(@NonNull String query, boolean isCategory, @NonNull String locale,
-                                long timestamp, boolean isMapAndTable)
+                                long timestamp, boolean isMapAndTable, boolean hasLocation, double lat, double lon)
   {
     nativeRunInteractiveSearch(query.getBytes(StandardCharsets.UTF_8), isCategory,
-            locale, timestamp, isMapAndTable);
+            locale, timestamp, isMapAndTable, hasLocation, lat, lon);
+  }
+
+  @MainThread
+  public void searchInteractive(@NonNull String query, boolean isCategory, @NonNull String locale,
+                                long timestamp, boolean isMapAndTable)
+  {
+    searchInteractive(query, isCategory, locale, timestamp, isMapAndTable, false, 0, 0);
   }
 
   @MainThread
   public void searchInteractive(@NonNull Context context, @NonNull String query, boolean isCategory,
                                 long timestamp, boolean isMapAndTable)
   {
-    searchInteractive(query, isCategory, Language.getKeyboardLocale(context), timestamp, isMapAndTable);
+    searchInteractive(query, isCategory, Language.getKeyboardLocale(context), timestamp, isMapAndTable, false, 0, 0);
   }
 
   @MainThread
@@ -150,6 +157,13 @@ public enum SearchEngine implements NativeSearchListener,
                         timestamp);
   }
 
+  @MainThread
+  public void searchInteractive(@NonNull Context context, @NonNull String query, boolean isCategory,
+                                long timestamp, boolean isMapAndTable, boolean hasLocation, double lat, double lon)
+  {
+    searchInteractive(query, isCategory, Language.getKeyboardLocale(context), timestamp, isMapAndTable, hasLocation, lat, lon);
+  }
+
   @MainThread
   public boolean searchInBookmarks(@NonNull String query, long categoryId, long timestamp)
   {
@@ -227,7 +241,8 @@ public enum SearchEngine implements NativeSearchListener,
    */
   private static native void nativeRunInteractiveSearch(byte[] bytes, boolean isCategory,
                                                         String language, long timestamp,
-                                                        boolean isMapAndTable);
+                                                        boolean isMapAndTable, boolean hasLocation,
+                                                        double lat, double lon);
 
   /**
    * @param bytes utf-8 formatted query bytes
diff --git a/android/src/app/organicmaps/search/SearchResult.java b/android/src/app/organicmaps/search/SearchResult.java
index 4460c8054f..8910b78fb7 100644
--- a/android/src/app/organicmaps/search/SearchResult.java
+++ b/android/src/app/organicmaps/search/SearchResult.java
@@ -1,8 +1,17 @@
 package app.organicmaps.search;
 
+import android.content.Context;
+import android.graphics.Typeface;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.StyleSpan;
+
 import androidx.annotation.NonNull;
 
 import app.organicmaps.bookmarks.data.FeatureId;
+import app.organicmaps.util.Utils;
 
 /**
  * Class instances are created from native code.
@@ -112,4 +121,69 @@ public class SearchResult implements PopularityProvider
   {
     return mPopularity;
   }
+
+  @NonNull
+  public String getTitle(@NonNull Context context)
+  {
+    String title = name;
+    if (TextUtils.isEmpty(title))
+    {
+      title = description != null
+          ? Utils.getLocalizedFeatureType(context, description.featureType)
+          : "";
+    }
+
+    return title;
+  }
+
+  @NonNull
+  public Spannable getFormattedTitle(@NonNull Context context)
+  {
+    final String title = getTitle(context);
+    final SpannableStringBuilder builder = new SpannableStringBuilder(title);
+
+    if (highlightRanges != null)
+    {
+      final int size = highlightRanges.length / 2;
+      int index = 0;
+
+      for (int i = 0; i < size; i++)
+      {
+        final int start = highlightRanges[index++];
+        final int len = highlightRanges[index++];
+
+        builder.setSpan(new StyleSpan(Typeface.BOLD), start, start + len, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      }
+    }
+
+    return builder;
+  }
+
+  // FIXME: Better format based on result type
+  @NonNull
+  public CharSequence getFormattedDescription(@NonNull Context context)
+  {
+    final String localizedType = Utils.getLocalizedFeatureType(context, description.featureType);
+    final SpannableStringBuilder res = new SpannableStringBuilder(localizedType);
+    final SpannableStringBuilder tail = new SpannableStringBuilder();
+
+    if (!TextUtils.isEmpty(description.airportIata))
+      tail.append(" • ").append(description.airportIata);
+    else if (!TextUtils.isEmpty(description.roadShields))
+      tail.append(" • ").append(description.roadShields);
+    else
+    {
+      if (!TextUtils.isEmpty(description.brand))
+        tail.append(" • ").append(Utils.getLocalizedBrand(context, description.brand));
+      if (!TextUtils.isEmpty(description.cuisine))
+        tail.append(" • ").append(description.cuisine);
+    }
+
+    if (isHotel && stars != 0)
+      tail.append(" • ").append("★★★★★★★".substring(0, Math.min(7, stars)));
+
+    res.append(tail);
+
+    return res;
+  }
 }