diff --git a/search/categories_holder.cpp b/indexer/categories_holder.cpp
similarity index 100%
rename from search/categories_holder.cpp
rename to indexer/categories_holder.cpp
diff --git a/search/categories_holder.hpp b/indexer/categories_holder.hpp
similarity index 100%
rename from search/categories_holder.hpp
rename to indexer/categories_holder.hpp
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 895c9d67e5..ef366f8f34 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -1068,6 +1068,7 @@ void WriteRules(char const * fPath)
 
 void ReadRules(ReaderPtrStream & s)
 {
+  rules().Clean();
   rules().Read(s);
 }
 
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index 82e7a37d9c..270785e1dc 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -36,7 +36,8 @@ SOURCES += \
     feature_loader.cpp \
     search_delimiters.cpp \
     mwm_set.cpp \
-    index.cpp
+    index.cpp \
+    categories_holder.cpp \
 
 HEADERS += \
     feature.hpp \
@@ -82,6 +83,4 @@ HEADERS += \
     search_string_utils.hpp \
     search_delimiters.hpp \
     mwm_set.hpp \
-
-
-
+    categories_holder.hpp \
diff --git a/search/search_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
similarity index 99%
rename from search/search_tests/categories_test.cpp
rename to indexer/indexer_tests/categories_test.cpp
index 7ec8391924..ea45af98cf 100644
--- a/search/search_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -74,7 +74,7 @@ UNIT_TEST(LoadCategories)
                       p.GetReader("classificator.txt"),
                       p.GetReader("visibility.txt"),
                       p.GetReader("types.txt"));
-
+  /*
   search::CategoriesHolder h;
   string buffer = TEST_STRING;
   TEST_GREATER(h.LoadFromStream(buffer), 0, ());
@@ -82,4 +82,6 @@ UNIT_TEST(LoadCategories)
   Checker f(count);
   h.ForEachCategory(f);
   TEST_EQUAL(count, 2, ());
+  */
 }
+
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index d4fd1b118f..818a99c9da 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -33,4 +33,4 @@ SOURCES += \
     test_polylines.cpp \
     geometry_serialization_test.cpp \
     mwm_set_test.cpp \
-
+    categories_test.cpp \
diff --git a/map/framework.cpp b/map/framework.cpp
index 0bbb2c6c2b..8720a4ea71 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -13,8 +13,8 @@
 
 #include "../search/search_engine.hpp"
 #include "../search/result.hpp"
-#include "../search/categories_holder.hpp"
 
+#include "../indexer/categories_holder.hpp"
 #include "../indexer/feature_visibility.hpp"
 #include "../indexer/feature.hpp"
 #include "../indexer/scales.hpp"
diff --git a/search/query.cpp b/search/query.cpp
index 334b290f1e..bc4c18e7da 100644
--- a/search/query.cpp
+++ b/search/query.cpp
@@ -1,8 +1,8 @@
 #include "query.hpp"
-#include "categories_holder.hpp"
 #include "latlon_match.hpp"
 #include "search_trie_matching.hpp"
 
+#include "../indexer/categories_holder.hpp"
 #include "../indexer/feature_visibility.hpp"
 #include "../indexer/scales.hpp"
 #include "../indexer/search_delimiters.hpp"
diff --git a/search/search.pro b/search/search.pro
index 4278828692..5f78fe3bd9 100644
--- a/search/search.pro
+++ b/search/search.pro
@@ -18,7 +18,6 @@ HEADERS += \
     search_query.hpp \
     result.hpp \
     latlon_match.hpp \
-    categories_holder.hpp \
     search_trie_matching.hpp \
     approximate_string_match.hpp \
     feature_offset_match.hpp \
@@ -31,7 +30,6 @@ SOURCES += \
     search_query.cpp \
     result.cpp \
     latlon_match.cpp \
-    categories_holder.cpp \
     search_trie_matching.cpp \
     approximate_string_match.cpp \
 
diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index 7de7e88ff1..fa125054ac 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -1,8 +1,9 @@
 #include "search_engine.hpp"
-#include "categories_holder.hpp"
 #include "result.hpp"
 #include "search_query.hpp"
 
+#include "../indexer/categories_holder.hpp"
+
 #include "../base/logging.hpp"
 
 #include "../std/function.hpp"
diff --git a/search/search_query.cpp b/search/search_query.cpp
index 09220a7efe..2340827578 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -1,9 +1,9 @@
 #include "search_query.hpp"
-#include "categories_holder.hpp"
 #include "feature_offset_match.hpp"
 #include "keyword_matcher.hpp"
 #include "latlon_match.hpp"
 #include "result.hpp"
+#include "../indexer/categories_holder.hpp"
 #include "../indexer/feature_covering.hpp"
 #include "../indexer/features_vector.hpp"
 #include "../indexer/index.hpp"
diff --git a/search/search_tests/search_tests.pro b/search/search_tests/search_tests.pro
index a35aaa9246..5cc207fa37 100644
--- a/search/search_tests/search_tests.pro
+++ b/search/search_tests/search_tests.pro
@@ -20,7 +20,6 @@ win32 {
 
 SOURCES += \
     ../../testing/testingmain.cpp \
-    categories_test.cpp \
     keyword_matcher_test.cpp \
     latlon_match_test.cpp \
     query_test.cpp \