diff --git a/data/categories.txt b/data/categories.txt
index 2205387ef9..f71add89a5 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -1,14 +1,14 @@
 amenity-atm
-en:atm|cash
-ru:банкомат|наличка
+en:1atm|cash
+ru:2банкомат|наличка
 
 amenity-bank
 en:bank
 ru:банк
 
 amenity-bar|amenity-pub
-en:bar|pub|beer
-ru:бар|паб|забегаловка|пиво|выпить
+en:1bar|pub|beer
+ru:1бар|паб|забегаловка|пиво|выпить
 
 amenity-bench
 en:bench
@@ -108,8 +108,8 @@ en:trash|bin|garbage
 ru:мусорка
 
 amenity-restaurant
-en:restaurant
-ru:ресторан
+en:0restaurant
+ru:0ресторан
 
 amenity-school
 en:school
diff --git a/map/framework.cpp b/map/framework.cpp
index 9458e381bd..e2fb80c616 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1182,8 +1182,7 @@ void FrameWork<TModel>::AddRedrawCommandSure()
       search::CategoriesHolder holder;
       ifstream file(GetPlatform().ReadPathForFile(SEARCH_CATEGORIES_FILE_NAME).c_str());
       holder.LoadFromStream(file);
-      // @TODO: use categories in search
-      m_pSearchEngine.reset(new search::Engine(&m_model.GetIndex()));
+      m_pSearchEngine.reset(new search::Engine(&m_model.GetIndex(), holder));
     }
 
     m_pSearchEngine->Search(text, m_navigator.Screen().GlobalRect(), callback);
diff --git a/search/categories_holder.cpp b/search/categories_holder.cpp
index cb23603deb..e916c15e78 100644
--- a/search/categories_holder.cpp
+++ b/search/categories_holder.cpp
@@ -104,4 +104,9 @@ size_t CategoriesHolder::LoadFromStream(istream & stream)
   return m_categories.size();
 }
 
+void CategoriesHolder::swap(CategoriesHolder & o)
+{
+  m_categories.swap(o.m_categories);
+}
+
 }
diff --git a/search/categories_holder.hpp b/search/categories_holder.hpp
index d261991ae7..a6f5922b30 100644
--- a/search/categories_holder.hpp
+++ b/search/categories_holder.hpp
@@ -31,6 +31,8 @@ class CategoriesHolder
   ContainerT m_categories;
 
 public:
+  typedef ContainerT::const_iterator const_iterator;
+
   /// @return number of loaded categories or 0 if something goes wrong
   size_t LoadFromStream(istream & stream);
 
@@ -39,6 +41,16 @@ public:
   {
     for_each(m_categories.begin(), m_categories.end(), toDo);
   }
+
+  const_iterator begin() const { return m_categories.begin(); }
+  const_iterator end() const { return m_categories.end(); }
+
+  void swap(CategoriesHolder & o);
 };
 
+inline void swap(CategoriesHolder & a, CategoriesHolder & b)
+{
+  return a.swap(b);
+}
+
 }
diff --git a/search/engine.cpp b/search/engine.cpp
index 053e2ffd7f..fea7965aa4 100644
--- a/search/engine.cpp
+++ b/search/engine.cpp
@@ -1,3 +1,4 @@
+#include "categories_holder.hpp"
 #include "engine.hpp"
 #include "query.hpp"
 #include "result.hpp"
@@ -12,10 +13,12 @@
 namespace search
 {
 
-Engine::Engine(IndexType const * pIndex)
-  : m_pIndex(pIndex), m_pRunner(new threads::ConcurrentRunner), m_pLastQuery(NULL),
+Engine::Engine(IndexType const * pIndex, CategoriesHolder & categories)
+  : m_pIndex(pIndex), m_pCategories(new CategoriesHolder()),
+    m_pRunner(new threads::ConcurrentRunner), m_pLastQuery(NULL),
     m_queriesActive(0)
 {
+  m_pCategories->swap(categories);
 }
 
 Engine::~Engine()
@@ -30,7 +33,7 @@ void Engine::Search(string const & queryText,
 {
   LOG(LDEBUG, (queryText, rect));
 
-  impl::Query * pQuery = new impl::Query(queryText, rect, m_pIndex, this);
+  impl::Query * pQuery = new impl::Query(queryText, rect, m_pIndex, this, m_pCategories.get());
 
   {
     threads::MutexGuard mutexGuard(m_mutex);
diff --git a/search/engine.hpp b/search/engine.hpp
index ce5d3d5063..7fccb352dc 100644
--- a/search/engine.hpp
+++ b/search/engine.hpp
@@ -19,6 +19,7 @@ namespace search
 {
 
 namespace impl { class Query; }
+class CategoriesHolder;
 class Result;
 
 class Engine
@@ -26,7 +27,8 @@ class Engine
 public:
   typedef Index<FileReader>::Type IndexType;
 
-  explicit Engine(IndexType const * pIndex);
+  /// Doesn't take ownership of @pIndex. Modifies @categories.
+  Engine(IndexType const * pIndex, CategoriesHolder & categories);
   ~Engine();
 
   void Search(string const & query,
@@ -39,6 +41,7 @@ public:
 
 private:
   IndexType const * m_pIndex;
+  scoped_ptr<CategoriesHolder> m_pCategories;
   scoped_ptr<threads::IRunner> m_pRunner;
   threads::Mutex m_mutex;
   impl::Query * volatile m_pLastQuery;
diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp
index 16d9836616..79ecba683c 100644
--- a/search/intermediate_result.cpp
+++ b/search/intermediate_result.cpp
@@ -37,6 +37,10 @@ IntermediateResult::IntermediateResult(m2::RectD const & viewportRect,
   m_direction = ResultDirection(viewportRect.Center(), m_rect.Center());
 }
 
+IntermediateResult::IntermediateResult(string name, string completionString)
+  : m_str(name), m_completionString(completionString),
+    m_matchPenalty(0), m_minVisibleScale(0), m_distance(0), m_direction(0),
+    m_resultType(RESULT_CATEGORY)
 {
 }
 
@@ -66,8 +70,11 @@ Result IntermediateResult::GenerateFinalResult() const
     return Result(m_str, m_type, m_rect, m_distance, m_direction);
   case RESULT_LATLON:
     return Result(m_str, 0, m_rect, m_distance, m_direction);
+  case RESULT_CATEGORY:
+    return Result(m_str, m_completionString);
   default:
     ASSERT(false, ());
+    return Result(m_str, m_completionString);
   }
 }
 
diff --git a/search/intermediate_result.hpp b/search/intermediate_result.hpp
index 360248d3ba..303f4bea20 100644
--- a/search/intermediate_result.hpp
+++ b/search/intermediate_result.hpp
@@ -13,6 +13,7 @@ public:
   enum ResultType
   {
     RESULT_LATLON,
+    RESULT_CATEGORY,
     RESULT_FEATURE
   };
 
@@ -26,6 +27,9 @@ public:
   // For RESULT_LATLON.
   IntermediateResult(m2::RectD const & viewportRect, double lat, double lon, double precision);
 
+  // For RESULT_CATEGORY.
+  IntermediateResult(string name, string completionString);
+
   bool operator < (IntermediateResult const & o) const;
 
   Result GenerateFinalResult() const;
@@ -37,6 +41,7 @@ private:
                                 m2::PointD const & featureCenter);
 
   string m_str;
+  string m_completionString;
   m2::RectD m_rect;
   uint32_t m_type;
   int m_matchPenalty;
diff --git a/search/query.cpp b/search/query.cpp
index 1698ef9676..4c4b142050 100644
--- a/search/query.cpp
+++ b/search/query.cpp
@@ -1,4 +1,5 @@
 #include "query.hpp"
+#include "categories_holder.hpp"
 #include "delimiters.hpp"
 #include "latlon_match.hpp"
 #include "string_match.hpp"
@@ -95,8 +96,9 @@ struct FeatureProcessor
 }  // unnamed namespace
 
 Query::Query(string const & query, m2::RectD const & viewport, IndexType const * pIndex,
-             Engine * pEngine)
-  : m_queryText(query), m_viewport(viewport), m_pIndex(pIndex ? new IndexType(*pIndex) : NULL),
+             Engine * pEngine, CategoriesHolder * pCategories)
+  : m_queryText(query), m_viewport(viewport), m_pCategories(pCategories),
+    m_pIndex(pIndex ? new IndexType(*pIndex) : NULL),
     m_pEngine(pEngine), m_bTerminate(false)
 {
   search::Delimiters delims;
@@ -130,16 +132,35 @@ void Query::Search(function<void (Result const &)> const & f)
     return;
 
   // Category matching.
-  if (!m_prefix.empty())
+  if (m_pCategories)
   {
-    KeywordMatcher matcher = MakeMatcher(vector<strings::UniString>(), m_prefix);
-    // LOG(LINFO, (m_prefix));
-    matcher.ProcessNameToken("", strings::MakeUniString("restaurant"));
-    uint32_t const matchScore = matcher.GetMatchScore();
-    if (matcher.GetPrefixMatchScore() <= GetMaxPrefixMatchScore(m_prefix.size()) &&
-        matchScore <= GetMaxKeywordMatchScore())
+    for (int i = 0; i < m_keywords.size(); ++i)
     {
-      f(Result("restaurant", "restaurant "));
+
+    }
+
+    // TODO: Check if some keyword matched category?
+    if (!m_prefix.empty())
+    {
+      for (CategoriesHolder::const_iterator iCategory = m_pCategories->begin();
+           iCategory != m_pCategories->end(); ++iCategory)
+      {
+        KeywordMatcher matcher = MakeMatcher(vector<strings::UniString>(), m_prefix);
+
+        for (vector<Category::Name>::const_iterator iName = iCategory->m_synonyms.begin();
+             iName != iCategory->m_synonyms.end(); ++iName)
+        {
+          if (m_prefix.size() >= iName->m_prefixLengthToSuggest)
+            matcher.ProcessNameToken(iName->m_Name, strings::MakeUniString(iName->m_Name));
+        }
+
+        if (matcher.GetPrefixMatchScore() <= GetMaxPrefixMatchScore(m_prefix.size()) &&
+            matcher.GetMatchScore() <= GetMaxKeywordMatchScore())
+        {
+          AddResult(IntermediateResult(matcher.GetBestMatchName(),
+                                       matcher.GetBestMatchName() + ' '));
+        }
+      }
     }
   }
 
diff --git a/search/query.hpp b/search/query.hpp
index f960fecbb4..d19bd3b444 100644
--- a/search/query.hpp
+++ b/search/query.hpp
@@ -14,6 +14,9 @@
 
 namespace search
 {
+
+class CategoriesHolder;
+
 namespace impl
 {
 
@@ -23,7 +26,7 @@ public:
   typedef Engine::IndexType IndexType;
 
   Query(string const & query, m2::RectD const & viewport, IndexType const * pIndex,
-        Engine * pEngine);
+        Engine * pEngine, CategoriesHolder * pCategories);
   ~Query();
 
   // Search with parameters, passed in constructor.
@@ -47,8 +50,10 @@ public:
 private:
   string m_queryText;
   m2::RectD m_viewport;
+  CategoriesHolder * m_pCategories;
 
   vector<strings::UniString> m_keywords;
+  vector<vector<uint32_t> > m_keywordCategories;
   strings::UniString m_prefix;
 
   scoped_ptr<IndexType const> m_pIndex;
diff --git a/search/search_tests/query_test.cpp b/search/search_tests/query_test.cpp
index 1451445013..30ad34937a 100644
--- a/search/search_tests/query_test.cpp
+++ b/search/search_tests/query_test.cpp
@@ -13,16 +13,16 @@ UNIT_TEST(QueryParseKeywords_Smoke)
   vector<UniString> expected;
   expected.push_back(MakeUniString("minsk"));
   expected.push_back(MakeUniString("belarus"));
-  TEST_EQUAL(expected,            Query("minsk belarus ", m2::RectD(), 0, 0).GetKeywords(), ());
-  TEST_EQUAL(MakeUniString(""),   Query("minsk belarus ", m2::RectD(), 0, 0).GetPrefix(), ());
-  TEST_EQUAL(expected,            Query("minsk belarus ma", m2::RectD(), 0, 0).GetKeywords(), ());
-  TEST_EQUAL(MakeUniString("ma"), Query("minsk belarus ma", m2::RectD(), 0, 0).GetPrefix(), ());
+  TEST_EQUAL(expected,            Query("minsk belarus ", m2::RectD(), 0, 0, 0).GetKeywords(), ());
+  TEST_EQUAL(MakeUniString(""),   Query("minsk belarus ", m2::RectD(), 0, 0, 0).GetPrefix(), ());
+  TEST_EQUAL(expected,            Query("minsk belarus ma", m2::RectD(), 0, 0, 0).GetKeywords(), ());
+  TEST_EQUAL(MakeUniString("ma"), Query("minsk belarus ma", m2::RectD(), 0, 0, 0).GetPrefix(), ());
 }
 
 UNIT_TEST(QueryParseKeywords_Empty)
 {
-  TEST_EQUAL(vector<UniString>(), Query("", m2::RectD(), 0, 0).GetKeywords(), ());
-  TEST_EQUAL(MakeUniString(""),   Query("", m2::RectD(), 0, 0).GetPrefix(), ());
-  TEST_EQUAL(vector<UniString>(), Query("Z", m2::RectD(), 0, 0).GetKeywords(), ());
-  TEST_EQUAL(MakeUniString("z"),  Query("Z", m2::RectD(), 0, 0).GetPrefix(), ());
+  TEST_EQUAL(vector<UniString>(), Query("", m2::RectD(), 0, 0, 0).GetKeywords(), ());
+  TEST_EQUAL(MakeUniString(""),   Query("", m2::RectD(), 0, 0, 0).GetPrefix(), ());
+  TEST_EQUAL(vector<UniString>(), Query("Z", m2::RectD(), 0, 0, 0).GetKeywords(), ());
+  TEST_EQUAL(MakeUniString("z"),  Query("Z", m2::RectD(), 0, 0, 0).GetPrefix(), ());
 }