diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp
index 71e3ee4331..38016cde00 100644
--- a/android/jni/com/mapswithme/maps/SearchEngine.cpp
+++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp
@@ -139,7 +139,7 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI
                                                       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(), popularity.get());
+                     ranges.get(), result.IsHotel(), result.GetStarsCount(), popularity.get());
   ASSERT(ret, ());
 
   return ret;
@@ -249,7 +249,7 @@ extern "C"
     g_resultClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/SearchResult");
     g_resultConstructor = jni::GetConstructorID(
         env, g_resultClass,
-        "(Ljava/lang/String;Lcom/mapswithme/maps/search/SearchResult$Description;DD[IZ"
+        "(Ljava/lang/String;Lcom/mapswithme/maps/search/SearchResult$Description;DD[IZI"
           "Lcom/mapswithme/maps/search/Popularity;)V");
     g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I)V");
     g_descriptionClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/SearchResult$Description");
diff --git a/android/src/com/mapswithme/maps/search/SearchAdapter.java b/android/src/com/mapswithme/maps/search/SearchAdapter.java
index 3938bdacc2..2d7ba93853 100644
--- a/android/src/com/mapswithme/maps/search/SearchAdapter.java
+++ b/android/src/com/mapswithme/maps/search/SearchAdapter.java
@@ -176,6 +176,11 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
         }
       }
 
+      if (result.isHotel && result.stars != 0)
+      {
+        tail.append(" • ").append("★★★★★★★".substring(0, Math.min(7, result.stars)));
+      }
+
       res.append(tail);
 
       return res;
diff --git a/android/src/com/mapswithme/maps/search/SearchResult.java b/android/src/com/mapswithme/maps/search/SearchResult.java
index 4c5337abdb..1eef5fa37a 100644
--- a/android/src/com/mapswithme/maps/search/SearchResult.java
+++ b/android/src/com/mapswithme/maps/search/SearchResult.java
@@ -67,6 +67,7 @@ public class SearchResult implements PopularityProvider
   // Consecutive pairs of indexes (each pair contains : start index, length), specifying highlighted matches of original query in result
   public final int[] highlightRanges;
 
+  public final int stars;
   public final boolean isHotel;
   @NonNull
   private final Popularity mPopularity;
@@ -77,6 +78,7 @@ public class SearchResult implements PopularityProvider
     this.suggestion = suggestion;
     this.lat = lat;
     this.lon = lon;
+    this.stars = 0;
     this.isHotel = false;
     this.description = null;
     this.type = TYPE_SUGGEST;
@@ -85,10 +87,11 @@ public class SearchResult implements PopularityProvider
   }
 
   public SearchResult(String name, Description description, double lat, double lon, int[] highlightRanges,
-                      boolean isHotel, @NonNull Popularity popularity)
+                      boolean isHotel, int stars, @NonNull Popularity popularity)
   {
     this.type = TYPE_RESULT;
     this.name = name;
+    this.stars = stars;
     this.isHotel = isHotel;
     mPopularity = popularity;
     this.suggestion = null;
diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
index b505db83e8..969ecfda23 100644
--- a/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
+++ b/iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm
@@ -32,7 +32,7 @@
   self.locationLabel.text = @(result.GetAddress().c_str());
   [self.locationLabel sizeToFit];
 
-  NSUInteger const starsCount = result.GetStarsCount();
+  int const starsCount = std::min(7, result.GetStarsCount());
   NSString * cuisine = @(result.GetCuisine().c_str()).capitalizedString;
   NSString * airportIata = @(result.GetAirportIata().c_str());
   NSString * roadShields = @(result.GetRoadShields().c_str());
@@ -42,9 +42,11 @@
   
   NSString * description = @"";
 
-  static NSString * fiveStars = [NSString stringWithUTF8String:"★★★★★"];
-  if (starsCount > 0)
-    description = [fiveStars substringToIndex:starsCount];
+  if (result.IsHotel() && starsCount > 0)
+  {
+    static NSString * sevenStars = [NSString stringWithUTF8String:"★★★★★★★"];
+    description = [sevenStars substringToIndex:starsCount];
+  }
   else if (airportIata.length > 0)
     description = airportIata;
   else if (roadShields.length > 0)
diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp
index 2f8b35fa76..58ba9ba4eb 100644
--- a/search/intermediate_result.cpp
+++ b/search/intermediate_result.cpp
@@ -281,7 +281,8 @@ void FillDetails(FeatureType & ft, Result::Details & details)
     }
   }
 
-  if (strings::to_uint(ft.GetMetadata(feature::Metadata::FMD_STARS), details.m_stars))
+  details.m_isHotel = ftypes::IsHotelChecker::Instance()(ft);
+  if (details.m_isHotel && strings::to_uint(ft.GetMetadata(feature::Metadata::FMD_STARS), details.m_stars))
     details.m_stars = std::min(details.m_stars, osm::MapObject::kMaxStarsCount);
   else
     details.m_stars = 0;