[new downloader][ios] Updated ui for new downloader.

6 files changed, 157 insertions, 82 deletions

diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
index 3b045b37a5..08c999d192 100644
--- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
+++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
@@ -7,8 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3413E3431C0DCAB800D14D24 /* requested_tiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3413E3411C0DCAB800D14D24 /* requested_tiles.cpp */; };
-		3413E3441C0DCAB800D14D24 /* requested_tiles.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3413E3421C0DCAB800D14D24 /* requested_tiles.hpp */; };
+		56BF56DA1C7608C0006DD7CB /* choose_position_mark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56BF56D81C7608C0006DD7CB /* choose_position_mark.cpp */; };
+		56BF56DB1C7608C0006DD7CB /* choose_position_mark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56BF56D91C7608C0006DD7CB /* choose_position_mark.hpp */; };
+		56D545661C74A44900E3719C /* overlay_batcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D545641C74A44900E3719C /* overlay_batcher.cpp */; };
+		56D545671C74A44900E3719C /* overlay_batcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D545651C74A44900E3719C /* overlay_batcher.hpp */; };
 		670947911BDF9BE1005014C0 /* intrusive_vector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947421BDF9BE0005014C0 /* intrusive_vector.hpp */; };
 		670947921BDF9BE1005014C0 /* kinetic_scroller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947431BDF9BE0005014C0 /* kinetic_scroller.cpp */; };
 		670947931BDF9BE1005014C0 /* kinetic_scroller.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947441BDF9BE0005014C0 /* kinetic_scroller.hpp */; };
@@ -70,10 +72,6 @@
 		670947CD1BDF9BE1005014C0 /* tile_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6709477E1BDF9BE0005014C0 /* tile_info.hpp */; };
 		670947CE1BDF9BE1005014C0 /* tile_key.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6709477F1BDF9BE0005014C0 /* tile_key.cpp */; };
 		670947CF1BDF9BE1005014C0 /* tile_key.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947801BDF9BE0005014C0 /* tile_key.hpp */; };
-		670947D01BDF9BE1005014C0 /* tile_tree_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947811BDF9BE0005014C0 /* tile_tree_builder.cpp */; };
-		670947D11BDF9BE1005014C0 /* tile_tree_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947821BDF9BE0005014C0 /* tile_tree_builder.hpp */; };
-		670947D21BDF9BE1005014C0 /* tile_tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947831BDF9BE0005014C0 /* tile_tree.cpp */; };
-		670947D31BDF9BE1005014C0 /* tile_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947841BDF9BE0005014C0 /* tile_tree.hpp */; };
 		670947D41BDF9BE1005014C0 /* tile_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947851BDF9BE0005014C0 /* tile_utils.cpp */; };
 		670947D51BDF9BE1005014C0 /* tile_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670947861BDF9BE0005014C0 /* tile_utils.hpp */; };
 		670947D61BDF9BE1005014C0 /* user_event_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670947871BDF9BE0005014C0 /* user_event_stream.cpp */; };
@@ -193,8 +191,10 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		3413E3411C0DCAB800D14D24 /* requested_tiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = requested_tiles.cpp; sourceTree = "<group>"; };
-		3413E3421C0DCAB800D14D24 /* requested_tiles.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = requested_tiles.hpp; sourceTree = "<group>"; };
+		56BF56D81C7608C0006DD7CB /* choose_position_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = choose_position_mark.cpp; sourceTree = "<group>"; };
+		56BF56D91C7608C0006DD7CB /* choose_position_mark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = choose_position_mark.hpp; sourceTree = "<group>"; };
+		56D545641C74A44900E3719C /* overlay_batcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = overlay_batcher.cpp; sourceTree = "<group>"; };
+		56D545651C74A44900E3719C /* overlay_batcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = overlay_batcher.hpp; sourceTree = "<group>"; };
 		6709473A1BDF9B82005014C0 /* libdrape_frontend.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libdrape_frontend.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		670947421BDF9BE0005014C0 /* intrusive_vector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = intrusive_vector.hpp; sourceTree = "<group>"; };
 		670947431BDF9BE0005014C0 /* kinetic_scroller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kinetic_scroller.cpp; sourceTree = "<group>"; };
@@ -259,10 +259,6 @@
 		6709477E1BDF9BE0005014C0 /* tile_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tile_info.hpp; sourceTree = "<group>"; };
 		6709477F1BDF9BE0005014C0 /* tile_key.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tile_key.cpp; sourceTree = "<group>"; };
 		670947801BDF9BE0005014C0 /* tile_key.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tile_key.hpp; sourceTree = "<group>"; };
-		670947811BDF9BE0005014C0 /* tile_tree_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tile_tree_builder.cpp; sourceTree = "<group>"; };
-		670947821BDF9BE0005014C0 /* tile_tree_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tile_tree_builder.hpp; sourceTree = "<group>"; };
-		670947831BDF9BE0005014C0 /* tile_tree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tile_tree.cpp; sourceTree = "<group>"; };
-		670947841BDF9BE0005014C0 /* tile_tree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tile_tree.hpp; sourceTree = "<group>"; };
 		670947851BDF9BE0005014C0 /* tile_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tile_utils.cpp; sourceTree = "<group>"; };
 		670947861BDF9BE0005014C0 /* tile_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tile_utils.hpp; sourceTree = "<group>"; };
 		670947871BDF9BE0005014C0 /* user_event_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_event_stream.cpp; sourceTree = "<group>"; };
@@ -412,6 +408,8 @@
 		670947411BDF9B99005014C0 /* drape_frontend */ = {
 			isa = PBXGroup;
 			children = (
+				56D545641C74A44900E3719C /* overlay_batcher.cpp */,
+				56D545651C74A44900E3719C /* overlay_batcher.hpp */,
 				670E39361C46C59000E9C0A6 /* batch_merge_helper.cpp */,
 				670E39371C46C59000E9C0A6 /* batch_merge_helper.hpp */,
 				670E39381C46C59000E9C0A6 /* color_constants.cpp */,
@@ -513,10 +511,6 @@
 				6709477E1BDF9BE0005014C0 /* tile_info.hpp */,
 				6709477F1BDF9BE0005014C0 /* tile_key.cpp */,
 				670947801BDF9BE0005014C0 /* tile_key.hpp */,
-				670947811BDF9BE0005014C0 /* tile_tree_builder.cpp */,
-				670947821BDF9BE0005014C0 /* tile_tree_builder.hpp */,
-				670947831BDF9BE0005014C0 /* tile_tree.cpp */,
-				670947841BDF9BE0005014C0 /* tile_tree.hpp */,
 				670947851BDF9BE0005014C0 /* tile_utils.cpp */,
 				670947861BDF9BE0005014C0 /* tile_utils.hpp */,
 				670947871BDF9BE0005014C0 /* user_event_stream.cpp */,
@@ -559,6 +553,8 @@
 		670948061BDF9C15005014C0 /* gui */ = {
 			isa = PBXGroup;
 			children = (
+				56BF56D81C7608C0006DD7CB /* choose_position_mark.cpp */,
+				56BF56D91C7608C0006DD7CB /* choose_position_mark.hpp */,
 				670948211BDF9C48005014C0 /* button.cpp */,
 				670948221BDF9C48005014C0 /* button.hpp */,
 				670948231BDF9C48005014C0 /* compass.cpp */,
@@ -630,8 +626,8 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				670947D31BDF9BE1005014C0 /* tile_tree.hpp in Headers */,
 				670947971BDF9BE1005014C0 /* line_shape.hpp in Headers */,
+				56BF56DB1C7608C0006DD7CB /* choose_position_mark.hpp in Headers */,
 				670948031BDF9BF5005014C0 /* drape_engine.hpp in Headers */,
 				6709486A1BDF9C7F005014C0 /* brush_info.hpp in Headers */,
 				670948401BDF9C48005014C0 /* country_status_helper.hpp in Headers */,
@@ -666,6 +662,7 @@
 				670947951BDF9BE1005014C0 /* line_shape_helper.hpp in Headers */,
 				670948501BDF9C48005014C0 /* skin.hpp in Headers */,
 				6709481B1BDF9C39005014C0 /* model_view_animation.hpp in Headers */,
+				56D545671C74A44900E3719C /* overlay_batcher.hpp in Headers */,
 				670947B21BDF9BE1005014C0 /* read_mwm_task.hpp in Headers */,
 				670947C91BDF9BE1005014C0 /* text_shape.hpp in Headers */,
 				6709483A1BDF9C48005014C0 /* button.hpp in Headers */,
@@ -675,7 +672,6 @@
 				6709479C1BDF9BE1005014C0 /* memory_feature_index.hpp in Headers */,
 				670947E51BDF9BEC005014C0 /* engine_context.hpp in Headers */,
 				6743D3701C3A9F090095054B /* framebuffer.hpp in Headers */,
-				670947D11BDF9BE1005014C0 /* tile_tree_builder.hpp in Headers */,
 				F6B283141C1B04680081957A /* gps_track_shape.hpp in Headers */,
 				670947BE1BDF9BE1005014C0 /* rule_drawer.hpp in Headers */,
 				6709487C1BDF9C7F005014C0 /* pen_info.hpp in Headers */,
@@ -786,6 +782,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56BF56DA1C7608C0006DD7CB /* choose_position_mark.cpp in Sources */,
 				67E91C751BDFC85E005CEE88 /* feature_processor.cpp in Sources */,
 				6743D36D1C3A9F090095054B /* arrow3d.cpp in Sources */,
 				670E393A1C46C59000E9C0A6 /* batch_merge_helper.cpp in Sources */,
@@ -798,8 +795,6 @@
 				67E91C7D1BDFC85E005CEE88 /* user_marks_provider.cpp in Sources */,
 				67E91C7E1BDFC85E005CEE88 /* visual_params.cpp in Sources */,
 				6709486E1BDF9C7F005014C0 /* default_font.cpp in Sources */,
-				670947D01BDF9BE1005014C0 /* tile_tree_builder.cpp in Sources */,
-				670947D21BDF9BE1005014C0 /* tile_tree.cpp in Sources */,
 				675D21661BFB785900717E4F /* ruler.cpp in Sources */,
 				675D218F1BFB871D00717E4F /* software_renderer.cpp in Sources */,
 				670947CE1BDF9BE1005014C0 /* tile_key.cpp in Sources */,
@@ -862,6 +857,7 @@
 				670948181BDF9C39005014C0 /* interpolations.cpp in Sources */,
 				670948021BDF9BF5005014C0 /* drape_engine.cpp in Sources */,
 				6709483F1BDF9C48005014C0 /* country_status_helper.cpp in Sources */,
+				56D545661C74A44900E3719C /* overlay_batcher.cpp in Sources */,
 				6709481C1BDF9C39005014C0 /* opacity_animation.cpp in Sources */,
 				6709479B1BDF9BE1005014C0 /* memory_feature_index.cpp in Sources */,
 				670947E61BDF9BEC005014C0 /* frontend_renderer.cpp in Sources */,
diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj
index 9a87251e44..ed711807b0 100644
--- a/xcode/geometry/geometry.xcodeproj/project.pbxproj
+++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj
@@ -9,8 +9,10 @@
 /* Begin PBXBuildFile section */
 		347F33701C454205009758CC /* triangle2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F336E1C454205009758CC /* triangle2d.cpp */; };
 		347F33711C454205009758CC /* triangle2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F336F1C454205009758CC /* triangle2d.hpp */; };
-		3492CC161C6DF05A0057D8E8 /* segment2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC141C6DF05A0057D8E8 /* segment2d.cpp */; };
-		3492CC171C6DF05A0057D8E8 /* segment2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC151C6DF05A0057D8E8 /* segment2d.hpp */; };
+		56D5456A1C74A46D00E3719C /* algorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D545681C74A46D00E3719C /* algorithm.cpp */; };
+		56D5456B1C74A46D00E3719C /* algorithm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D545691C74A46D00E3719C /* algorithm.hpp */; };
+		56EB1ED01C6B6DF30022D831 /* segment2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ECE1C6B6DF30022D831 /* segment2d.cpp */; };
+		56EB1ED11C6B6DF30022D831 /* segment2d.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ECF1C6B6DF30022D831 /* segment2d.hpp */; };
 		670F296A1BA9D3C200F2ABF4 /* equality.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29291BA9D2E700F2ABF4 /* equality.hpp */; };
 		670F296C1BA9D3C200F2ABF4 /* large_polygon.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F292B1BA9D2E700F2ABF4 /* large_polygon.hpp */; };
 		670F297A1BA9D3C200F2ABF4 /* test_regions.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F29391BA9D2E700F2ABF4 /* test_regions.hpp */; };
@@ -95,8 +97,10 @@
 /* Begin PBXFileReference section */
 		347F336E1C454205009758CC /* triangle2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = triangle2d.cpp; sourceTree = "<group>"; };
 		347F336F1C454205009758CC /* triangle2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = triangle2d.hpp; sourceTree = "<group>"; };
-		3492CC141C6DF05A0057D8E8 /* segment2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment2d.cpp; sourceTree = "<group>"; };
-		3492CC151C6DF05A0057D8E8 /* segment2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = segment2d.hpp; sourceTree = "<group>"; };
+		56D545681C74A46D00E3719C /* algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algorithm.cpp; sourceTree = "<group>"; };
+		56D545691C74A46D00E3719C /* algorithm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = algorithm.hpp; sourceTree = "<group>"; };
+		56EB1ECE1C6B6DF30022D831 /* segment2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = segment2d.cpp; sourceTree = "<group>"; };
+		56EB1ECF1C6B6DF30022D831 /* segment2d.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = segment2d.hpp; sourceTree = "<group>"; };
 		670D05A51B0E01FF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		670F29221BA9D2E700F2ABF4 /* angle_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = angle_test.cpp; sourceTree = "<group>"; };
 		670F29231BA9D2E700F2ABF4 /* anyrect_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = anyrect_test.cpp; sourceTree = "<group>"; };
@@ -258,8 +262,10 @@
 		675344931A3F684600A0A8C3 /* geometry */ = {
 			isa = PBXGroup;
 			children = (
-				3492CC141C6DF05A0057D8E8 /* segment2d.cpp */,
-				3492CC151C6DF05A0057D8E8 /* segment2d.hpp */,
+				56D545681C74A46D00E3719C /* algorithm.cpp */,
+				56D545691C74A46D00E3719C /* algorithm.hpp */,
+				56EB1ECE1C6B6DF30022D831 /* segment2d.cpp */,
+				56EB1ECF1C6B6DF30022D831 /* segment2d.hpp */,
 				347F336E1C454205009758CC /* triangle2d.cpp */,
 				347F336F1C454205009758CC /* triangle2d.hpp */,
 				E92D8BD21C15AFAA00A98D17 /* mercator.cpp */,
@@ -321,9 +327,10 @@
 				675344E01A3F68F900A0A8C3 /* boost_concept.hpp in Headers */,
 				675344C01A3F687400A0A8C3 /* cellid.hpp in Headers */,
 				675344CB1A3F687400A0A8C3 /* polyline2d.hpp in Headers */,
-				3492CC171C6DF05A0057D8E8 /* segment2d.hpp in Headers */,
+				56EB1ED11C6B6DF30022D831 /* segment2d.hpp in Headers */,
 				675344D21A3F687400A0A8C3 /* screenbase.hpp in Headers */,
 				E92D8BD51C15AFAA00A98D17 /* mercator.hpp in Headers */,
+				56D5456B1C74A46D00E3719C /* algorithm.hpp in Headers */,
 				675344BF1A3F687400A0A8C3 /* avg_vector.hpp in Headers */,
 				675344D31A3F687400A0A8C3 /* simplification.hpp in Headers */,
 				675344CC1A3F687400A0A8C3 /* rect_intersect.hpp in Headers */,
@@ -462,6 +469,7 @@
 			files = (
 				675344C31A3F687400A0A8C3 /* distance_on_sphere.cpp in Sources */,
 				675344CF1A3F687400A0A8C3 /* robust_orientation.cpp in Sources */,
+				56D5456A1C74A46D00E3719C /* algorithm.cpp in Sources */,
 				675344D41A3F687400A0A8C3 /* spline.cpp in Sources */,
 				675344D11A3F687400A0A8C3 /* screenbase.cpp in Sources */,
 				347F33701C454205009758CC /* triangle2d.cpp in Sources */,
@@ -471,7 +479,7 @@
 				E92D8BD11C15AF9100A98D17 /* mercator_test.cpp in Sources */,
 				675344C61A3F687400A0A8C3 /* packer.cpp in Sources */,
 				675344DE1A3F68F900A0A8C3 /* binary_operators.cpp in Sources */,
-				3492CC161C6DF05A0057D8E8 /* segment2d.cpp in Sources */,
+				56EB1ED01C6B6DF30022D831 /* segment2d.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index 54aebc83f4..3f8c061adc 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -17,6 +17,25 @@
 		347F33811C454242009758CC /* trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33781C454242009758CC /* trie.hpp */; };
 		347F33821C454242009758CC /* types_skipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33791C454242009758CC /* types_skipper.cpp */; };
 		347F33831C454242009758CC /* types_skipper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F337A1C454242009758CC /* types_skipper.hpp */; };
+		56C74C1C1C749E4700B71B9F /* categories_holder_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C121C749E4700B71B9F /* categories_holder_loader.cpp */; };
+		56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C131C749E4700B71B9F /* categories_holder.cpp */; };
+		56C74C1E1C749E4700B71B9F /* categories_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C141C749E4700B71B9F /* categories_holder.hpp */; };
+		56C74C1F1C749E4700B71B9F /* displacement_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C151C749E4700B71B9F /* displacement_manager.hpp */; };
+		56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C161C749E4700B71B9F /* edits_migration.cpp */; };
+		56C74C211C749E4700B71B9F /* edits_migration.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C171C749E4700B71B9F /* edits_migration.hpp */; };
+		56C74C221C749E4700B71B9F /* search_delimiters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C181C749E4700B71B9F /* search_delimiters.cpp */; };
+		56C74C231C749E4700B71B9F /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C191C749E4700B71B9F /* search_delimiters.hpp */; };
+		56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */; };
+		56C74C251C749E4700B71B9F /* search_string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */; };
+		56C74C2F1C749E8100B71B9F /* categories_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C261C749E8100B71B9F /* categories_test.cpp */; };
+		56C74C301C749E8100B71B9F /* drules_selector_parser_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */; };
+		56C74C311C749E8100B71B9F /* feature_metadata_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */; };
+		56C74C321C749E8100B71B9F /* feature_xml_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C291C749E8100B71B9F /* feature_xml_test.cpp */; };
+		56C74C331C749E8100B71B9F /* rank_table_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */; };
+		56C74C341C749E8100B71B9F /* search_string_utils_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */; };
+		56C74C351C749E8100B71B9F /* succinct_trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */; };
+		56C74C361C749E8100B71B9F /* test_mwm_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */; };
+		56C74C371C749E8100B71B9F /* trie_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56C74C2E1C749E8100B71B9F /* trie_test.cpp */; };
 		670C610D1AB065B100C38A8C /* cell_coverer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */; };
 		670C610E1AB065B100C38A8C /* cell_id_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FB1AB065B100C38A8C /* cell_id_test.cpp */; };
 		670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C60FC1AB065B100C38A8C /* checker_test.cpp */; };
@@ -34,7 +53,6 @@
 		670C611C1AB065B100C38A8C /* test_polylines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670C61091AB065B100C38A8C /* test_polylines.hpp */; };
 		670C611D1AB065B100C38A8C /* test_type.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610A1AB065B100C38A8C /* test_type.cpp */; };
 		670C611E1AB065B100C38A8C /* visibility_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C610B1AB065B100C38A8C /* visibility_test.cpp */; };
-		670C61201AB065E100C38A8C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C611F1AB065E100C38A8C /* testingmain.cpp */; };
 		670C612C1AB0663400C38A8C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670C611F1AB065E100C38A8C /* testingmain.cpp */; };
 		670C61401AB066CD00C38A8C /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6753409A1A3F53CB00A0A8C3 /* libindexer.a */; };
 		670C61421AB0670700C38A8C /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670C61411AB0670700C38A8C /* libplatform.a */; };
@@ -156,6 +174,25 @@
 		347F33781C454242009758CC /* trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = trie.hpp; sourceTree = "<group>"; };
 		347F33791C454242009758CC /* types_skipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_skipper.cpp; sourceTree = "<group>"; };
 		347F337A1C454242009758CC /* types_skipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_skipper.hpp; sourceTree = "<group>"; };
+		56C74C121C749E4700B71B9F /* categories_holder_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder_loader.cpp; sourceTree = "<group>"; };
+		56C74C131C749E4700B71B9F /* categories_holder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder.cpp; sourceTree = "<group>"; };
+		56C74C141C749E4700B71B9F /* categories_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_holder.hpp; sourceTree = "<group>"; };
+		56C74C151C749E4700B71B9F /* displacement_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = displacement_manager.hpp; sourceTree = "<group>"; };
+		56C74C161C749E4700B71B9F /* edits_migration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = edits_migration.cpp; sourceTree = "<group>"; };
+		56C74C171C749E4700B71B9F /* edits_migration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = edits_migration.hpp; sourceTree = "<group>"; };
+		56C74C181C749E4700B71B9F /* search_delimiters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_delimiters.cpp; sourceTree = "<group>"; };
+		56C74C191C749E4700B71B9F /* search_delimiters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_delimiters.hpp; sourceTree = "<group>"; };
+		56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_string_utils.cpp; sourceTree = "<group>"; };
+		56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_utils.hpp; sourceTree = "<group>"; };
+		56C74C261C749E8100B71B9F /* categories_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_test.cpp; sourceTree = "<group>"; };
+		56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_selector_parser_test.cpp; sourceTree = "<group>"; };
+		56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_metadata_test.cpp; sourceTree = "<group>"; };
+		56C74C291C749E8100B71B9F /* feature_xml_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = feature_xml_test.cpp; sourceTree = "<group>"; };
+		56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rank_table_test.cpp; sourceTree = "<group>"; };
+		56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_string_utils_test.cpp; sourceTree = "<group>"; };
+		56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = succinct_trie_test.cpp; sourceTree = "<group>"; };
+		56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_mwm_set.hpp; sourceTree = "<group>"; };
+		56C74C2E1C749E8100B71B9F /* trie_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = trie_test.cpp; sourceTree = "<group>"; };
 		670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell_coverer_test.cpp; sourceTree = "<group>"; };
 		670C60FB1AB065B100C38A8C /* cell_id_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cell_id_test.cpp; sourceTree = "<group>"; };
 		670C60FC1AB065B100C38A8C /* checker_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checker_test.cpp; sourceTree = "<group>"; };
@@ -307,6 +344,15 @@
 		670C60F81AB0657700C38A8C /* indexer_tests */ = {
 			isa = PBXGroup;
 			children = (
+				56C74C261C749E8100B71B9F /* categories_test.cpp */,
+				56C74C271C749E8100B71B9F /* drules_selector_parser_test.cpp */,
+				56C74C281C749E8100B71B9F /* feature_metadata_test.cpp */,
+				56C74C291C749E8100B71B9F /* feature_xml_test.cpp */,
+				56C74C2A1C749E8100B71B9F /* rank_table_test.cpp */,
+				56C74C2B1C749E8100B71B9F /* search_string_utils_test.cpp */,
+				56C74C2C1C749E8100B71B9F /* succinct_trie_test.cpp */,
+				56C74C2D1C749E8100B71B9F /* test_mwm_set.hpp */,
+				56C74C2E1C749E8100B71B9F /* trie_test.cpp */,
 				670C61571AB068C100C38A8C /* Libs */,
 				670C611F1AB065E100C38A8C /* testingmain.cpp */,
 				670C60FA1AB065B100C38A8C /* cell_coverer_test.cpp */,
@@ -383,6 +429,16 @@
 		6753409C1A3F53CB00A0A8C3 /* indexer */ = {
 			isa = PBXGroup;
 			children = (
+				56C74C121C749E4700B71B9F /* categories_holder_loader.cpp */,
+				56C74C131C749E4700B71B9F /* categories_holder.cpp */,
+				56C74C141C749E4700B71B9F /* categories_holder.hpp */,
+				56C74C151C749E4700B71B9F /* displacement_manager.hpp */,
+				56C74C161C749E4700B71B9F /* edits_migration.cpp */,
+				56C74C171C749E4700B71B9F /* edits_migration.hpp */,
+				56C74C181C749E4700B71B9F /* search_delimiters.cpp */,
+				56C74C191C749E4700B71B9F /* search_delimiters.hpp */,
+				56C74C1A1C749E4700B71B9F /* search_string_utils.cpp */,
+				56C74C1B1C749E4700B71B9F /* search_string_utils.hpp */,
 				347F33721C454242009758CC /* rank_table.cpp */,
 				347F33731C454242009758CC /* rank_table.hpp */,
 				347F33741C454242009758CC /* succinct_trie_builder.hpp */,
@@ -497,6 +553,7 @@
 				675341341A3F540F00A0A8C3 /* interval_index.hpp in Headers */,
 				675341241A3F540F00A0A8C3 /* feature_visibility.hpp in Headers */,
 				6753411D1A3F540F00A0A8C3 /* feature_loader_base.hpp in Headers */,
+				56C74C231C749E4700B71B9F /* search_delimiters.hpp in Headers */,
 				675341131A3F540F00A0A8C3 /* feature_algo.hpp in Headers */,
 				6726C1D21A49DAAC005EEA39 /* feature_meta.hpp in Headers */,
 				347F337F1C454242009758CC /* trie_builder.hpp in Headers */,
@@ -507,6 +564,8 @@
 				670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */,
 				6753412B1A3F540F00A0A8C3 /* geometry_coding.hpp in Headers */,
 				675340FF1A3F540F00A0A8C3 /* cell_coverer.hpp in Headers */,
+				56C74C361C749E8100B71B9F /* test_mwm_set.hpp in Headers */,
+				56C74C251C749E4700B71B9F /* search_string_utils.hpp in Headers */,
 				6753410C1A3F540F00A0A8C3 /* drawing_rule_def.hpp in Headers */,
 				675341001A3F540F00A0A8C3 /* cell_id.hpp in Headers */,
 				670D04AD1B0BA8580013A7AC /* interval_index_101.hpp in Headers */,
@@ -520,6 +579,7 @@
 				6753413C1A3F540F00A0A8C3 /* point_to_int64.hpp in Headers */,
 				6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */,
 				675341061A3F540F00A0A8C3 /* coding_params.hpp in Headers */,
+				56C74C211C749E4700B71B9F /* edits_migration.hpp in Headers */,
 				6753412F1A3F540F00A0A8C3 /* index_builder.hpp in Headers */,
 				675341411A3F540F00A0A8C3 /* scales.hpp in Headers */,
 				675341321A3F540F00A0A8C3 /* interval_index_builder.hpp in Headers */,
@@ -530,7 +590,9 @@
 				674125141B4C02F100A3E828 /* map_style_reader.hpp in Headers */,
 				675341221A3F540F00A0A8C3 /* feature_utils.hpp in Headers */,
 				347F337E1C454242009758CC /* succinct_trie_reader.hpp in Headers */,
+				56C74C1F1C749E4700B71B9F /* displacement_manager.hpp in Headers */,
 				675341171A3F540F00A0A8C3 /* feature_data.hpp in Headers */,
+				56C74C1E1C749E4700B71B9F /* categories_holder.hpp in Headers */,
 				347F33811C454242009758CC /* trie.hpp in Headers */,
 				6753410F1A3F540F00A0A8C3 /* drules_include.hpp in Headers */,
 				675341311A3F540F00A0A8C3 /* index.hpp in Headers */,
@@ -631,15 +693,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				56C74C321C749E8100B71B9F /* feature_xml_test.cpp in Sources */,
+				56C74C241C749E4700B71B9F /* search_string_utils.cpp in Sources */,
 				340DF9D01C1FF04D00B5C7EC /* osm_editor.cpp in Sources */,
 				67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */,
 				670D04AB1B0BA8580013A7AC /* feature_loader_101.cpp in Sources */,
 				6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */,
 				6753411A1A3F540F00A0A8C3 /* feature_impl.cpp in Sources */,
 				670C61111AB065B100C38A8C /* geometry_coding_test.cpp in Sources */,
+				56C74C1C1C749E4700B71B9F /* categories_holder_loader.cpp in Sources */,
 				6753410D1A3F540F00A0A8C3 /* drawing_rules.cpp in Sources */,
 				670C611E1AB065B100C38A8C /* visibility_test.cpp in Sources */,
 				675341301A3F540F00A0A8C3 /* index.cpp in Sources */,
+				56C74C201C749E4700B71B9F /* edits_migration.cpp in Sources */,
 				6753414D1A3F540F00A0A8C3 /* types_mapping.cpp in Sources */,
 				6753412A1A3F540F00A0A8C3 /* geometry_coding.cpp in Sources */,
 				670C61191AB065B100C38A8C /* scales_test.cpp in Sources */,
@@ -647,22 +713,28 @@
 				675341211A3F540F00A0A8C3 /* feature_utils.cpp in Sources */,
 				670C61151AB065B100C38A8C /* interval_index_test.cpp in Sources */,
 				670C61121AB065B100C38A8C /* geometry_serialization_test.cpp in Sources */,
+				56C74C341C749E8100B71B9F /* search_string_utils_test.cpp in Sources */,
 				675341231A3F540F00A0A8C3 /* feature_visibility.cpp in Sources */,
+				56C74C301C749E8100B71B9F /* drules_selector_parser_test.cpp in Sources */,
+				56C74C221C749E4700B71B9F /* search_delimiters.cpp in Sources */,
 				347F337B1C454242009758CC /* rank_table.cpp in Sources */,
 				670C610F1AB065B100C38A8C /* checker_test.cpp in Sources */,
 				347F33821C454242009758CC /* types_skipper.cpp in Sources */,
+				56C74C331C749E8100B71B9F /* rank_table_test.cpp in Sources */,
 				675341161A3F540F00A0A8C3 /* feature_data.cpp in Sources */,
 				675341031A3F540F00A0A8C3 /* classificator.cpp in Sources */,
-				670C61201AB065E100C38A8C /* testingmain.cpp in Sources */,
 				670C610E1AB065B100C38A8C /* cell_id_test.cpp in Sources */,
 				670C61131AB065B100C38A8C /* index_builder_test.cpp in Sources */,
 				675341401A3F540F00A0A8C3 /* scales.cpp in Sources */,
 				6753411E1A3F540F00A0A8C3 /* feature_loader.cpp in Sources */,
+				56C74C351C749E8100B71B9F /* succinct_trie_test.cpp in Sources */,
 				675341051A3F540F00A0A8C3 /* coding_params.cpp in Sources */,
 				670C610D1AB065B100C38A8C /* cell_coverer_test.cpp in Sources */,
 				670C61171AB065B100C38A8C /* mwm_set_test.cpp in Sources */,
 				675341251A3F540F00A0A8C3 /* feature.cpp in Sources */,
 				675341091A3F540F00A0A8C3 /* data_header.cpp in Sources */,
+				56C74C371C749E8100B71B9F /* trie_test.cpp in Sources */,
+				56C74C311C749E8100B71B9F /* feature_metadata_test.cpp in Sources */,
 				6753412C1A3F540F00A0A8C3 /* geometry_serialization.cpp in Sources */,
 				670EE56C1B60033A001E8064 /* features_vector.cpp in Sources */,
 				6726C1D11A49DAAC005EEA39 /* feature_meta.cpp in Sources */,
@@ -677,9 +749,11 @@
 				670C611B1AB065B100C38A8C /* test_polylines.cpp in Sources */,
 				674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */,
 				675341141A3F540F00A0A8C3 /* feature_covering.cpp in Sources */,
+				56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */,
 				675341371A3F540F00A0A8C3 /* mwm_set.cpp in Sources */,
 				675341181A3F540F00A0A8C3 /* feature_decl.cpp in Sources */,
 				6753410B1A3F540F00A0A8C3 /* drawing_rule_def.cpp in Sources */,
+				56C74C2F1C749E8100B71B9F /* categories_test.cpp in Sources */,
 				670C61141AB065B100C38A8C /* index_test.cpp in Sources */,
 				670C615B1AB0691900C38A8C /* features_offsets_table.cpp in Sources */,
 				675341281A3F540F00A0A8C3 /* ftypes_matcher.cpp in Sources */,
diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj
index 1ed3d5f215..5264fe04ce 100644
--- a/xcode/platform/platform.xcodeproj/project.pbxproj
+++ b/xcode/platform/platform.xcodeproj/project.pbxproj
@@ -7,10 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3492CC221C6DF0CC0057D8E8 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC1E1C6DF0CC0057D8E8 /* mwm_traits.cpp */; };
-		3492CC231C6DF0CC0057D8E8 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC1F1C6DF0CC0057D8E8 /* mwm_traits.hpp */; };
-		3492CC241C6DF0CC0057D8E8 /* file_logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC201C6DF0CC0057D8E8 /* file_logging.cpp */; };
-		3492CC251C6DF0CC0057D8E8 /* file_logging.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC211C6DF0CC0057D8E8 /* file_logging.hpp */; };
+		56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */; };
+		56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */; };
+		56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */; };
+		56EB1EDF1C6B6E6C0022D831 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */; };
 		670E8C761BB318AB00094197 /* platform_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C741BB318AB00094197 /* platform_ios.mm */; };
 		670E8C911BB31A2F00094197 /* ios_video_timer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C901BB31A2F00094197 /* ios_video_timer.mm */; };
 		671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62041AE9014C00076BD0 /* measurement_utils.cpp */; };
@@ -102,10 +102,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3492CC1E1C6DF0CC0057D8E8 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
-		3492CC1F1C6DF0CC0057D8E8 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
-		3492CC201C6DF0CC0057D8E8 /* file_logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_logging.cpp; sourceTree = "<group>"; };
-		3492CC211C6DF0CC0057D8E8 /* file_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file_logging.hpp; sourceTree = "<group>"; };
+		56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_logging.cpp; sourceTree = "<group>"; };
+		56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = file_logging.hpp; sourceTree = "<group>"; };
+		56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_traits.cpp; sourceTree = "<group>"; };
+		56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mwm_traits.hpp; sourceTree = "<group>"; };
 		670D05A71B0E03BF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		670E8C741BB318AB00094197 /* platform_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_ios.mm; sourceTree = "<group>"; };
 		670E8C901BB31A2F00094197 /* ios_video_timer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ios_video_timer.mm; sourceTree = "<group>"; };
@@ -303,10 +303,10 @@
 		6753437A1A3F5CF500A0A8C3 /* platform */ = {
 			isa = PBXGroup;
 			children = (
-				3492CC1E1C6DF0CC0057D8E8 /* mwm_traits.cpp */,
-				3492CC1F1C6DF0CC0057D8E8 /* mwm_traits.hpp */,
-				3492CC201C6DF0CC0057D8E8 /* file_logging.cpp */,
-				3492CC211C6DF0CC0057D8E8 /* file_logging.hpp */,
+				56EB1ED81C6B6E6C0022D831 /* file_logging.cpp */,
+				56EB1ED91C6B6E6C0022D831 /* file_logging.hpp */,
+				56EB1EDA1C6B6E6C0022D831 /* mwm_traits.cpp */,
+				56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */,
 				670E8C901BB31A2F00094197 /* ios_video_timer.mm */,
 				67AB92E81B7B3E9100AB5194 /* get_text_by_id.cpp */,
 				67AB92E91B7B3E9100AB5194 /* get_text_by_id.hpp */,
@@ -379,9 +379,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				675343B71A3F5D5A00A0A8C3 /* http_request.hpp in Headers */,
-				3492CC231C6DF0CC0057D8E8 /* mwm_traits.hpp in Headers */,
 				6741250B1B4C00CC00A3E828 /* country_file.hpp in Headers */,
 				675343B81A3F5D5A00A0A8C3 /* http_thread_apple.h in Headers */,
+				56EB1EDF1C6B6E6C0022D831 /* mwm_traits.hpp in Headers */,
 				675343C21A3F5D5A00A0A8C3 /* location.hpp in Headers */,
 				67AB92EB1B7B3E9100AB5194 /* get_text_by_id.hpp in Headers */,
 				675343D41A3F5D5A00A0A8C3 /* settings.hpp in Headers */,
@@ -398,7 +398,7 @@
 				675343D81A3F5D5A00A0A8C3 /* video_timer.hpp in Headers */,
 				6741250F1B4C00CC00A3E828 /* local_country_file.hpp in Headers */,
 				675343CF1A3F5D5A00A0A8C3 /* preferred_languages.hpp in Headers */,
-				3492CC251C6DF0CC0057D8E8 /* file_logging.hpp in Headers */,
+				56EB1EDD1C6B6E6C0022D831 /* file_logging.hpp in Headers */,
 				6741250D1B4C00CC00A3E828 /* local_country_file_utils.hpp in Headers */,
 				675343DA1A3F5D5A00A0A8C3 /* wifi_info.hpp in Headers */,
 				671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */,
@@ -531,7 +531,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3492CC221C6DF0CC0057D8E8 /* mwm_traits.cpp in Sources */,
 				675343D11A3F5D5A00A0A8C3 /* servers_list.cpp in Sources */,
 				675343C91A3F5D5A00A0A8C3 /* platform_unix_impl.cpp in Sources */,
 				67AB92DC1B7B3D7300AB5194 /* mwm_version.cpp in Sources */,
@@ -542,6 +541,7 @@
 				670E8C761BB318AB00094197 /* platform_ios.mm in Sources */,
 				67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */,
 				675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */,
+				56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */,
 				67247FFD1C60BD6500EDE56A /* write_dir_changer.cpp in Sources */,
 				6741250C1B4C00CC00A3E828 /* local_country_file_utils.cpp in Sources */,
 				67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */,
@@ -549,7 +549,7 @@
 				675343B61A3F5D5A00A0A8C3 /* http_request.cpp in Sources */,
 				675343CC1A3F5D5A00A0A8C3 /* platform.cpp in Sources */,
 				675343DB1A3F5D5A00A0A8C3 /* wifi_location_service.cpp in Sources */,
-				3492CC241C6DF0CC0057D8E8 /* file_logging.cpp in Sources */,
+				56EB1EDC1C6B6E6C0022D831 /* file_logging.cpp in Sources */,
 				675343D01A3F5D5A00A0A8C3 /* pthread_video_timer.cpp in Sources */,
 				675343B11A3F5D5A00A0A8C3 /* apple_location_service.mm in Sources */,
 				675343B31A3F5D5A00A0A8C3 /* chunks_download_strategy.cpp in Sources */,
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index b66aeeb33e..9e58974f21 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -8,8 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FB1C4540A8009758CC /* cancel_exception.hpp */; };
-		347F33171C4540A8009758CC /* categories_holder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F32FC1C4540A8009758CC /* categories_holder.cpp */; };
-		347F33181C4540A8009758CC /* categories_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FD1C4540A8009758CC /* categories_holder.hpp */; };
 		347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */; };
 		347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */; };
 		347F331B1C4540A8009758CC /* interval_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33001C4540A8009758CC /* interval_set.hpp */; };
@@ -23,13 +21,9 @@
 		347F33251C4540A8009758CC /* retrieval.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330A1C4540A8009758CC /* retrieval.hpp */; };
 		347F33261C4540A8009758CC /* reverse_geocoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F330B1C4540A8009758CC /* reverse_geocoder.cpp */; };
 		347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330C1C4540A8009758CC /* reverse_geocoder.hpp */; };
-		347F33281C4540A8009758CC /* search_delimiters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F330D1C4540A8009758CC /* search_delimiters.cpp */; };
-		347F33291C4540A8009758CC /* search_delimiters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330E1C4540A8009758CC /* search_delimiters.hpp */; };
 		347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F330F1C4540A8009758CC /* search_index_values.hpp */; };
 		347F332B1C4540A8009758CC /* search_query_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33101C4540A8009758CC /* search_query_base.cpp */; };
 		347F332C1C4540A8009758CC /* search_query_base.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33111C4540A8009758CC /* search_query_base.hpp */; };
-		347F332D1C4540A8009758CC /* search_string_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33121C4540A8009758CC /* search_string_utils.cpp */; };
-		347F332E1C4540A8009758CC /* search_string_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33131C4540A8009758CC /* search_string_utils.hpp */; };
 		347F332F1C4540A8009758CC /* search_trie.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33141C4540A8009758CC /* search_trie.hpp */; };
 		347F33301C4540A8009758CC /* suggest.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33151C4540A8009758CC /* suggest.hpp */; };
 		347F33561C45413C009758CC /* features_filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F333E1C45413C009758CC /* features_filter.cpp */; };
@@ -56,13 +50,15 @@
 		347F336B1C45413C009758CC /* search_query_v2.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33531C45413C009758CC /* search_query_v2.hpp */; };
 		347F336C1C45413C009758CC /* street_vicinity_loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33541C45413C009758CC /* street_vicinity_loader.cpp */; };
 		347F336D1C45413C009758CC /* street_vicinity_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33551C45413C009758CC /* street_vicinity_loader.hpp */; };
-		3492CC1B1C6DF0830057D8E8 /* locality_scorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3492CC181C6DF0830057D8E8 /* locality_scorer.cpp */; };
-		3492CC1C1C6DF0830057D8E8 /* locality_scorer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC191C6DF0830057D8E8 /* locality_scorer.hpp */; };
-		3492CC1D1C6DF0830057D8E8 /* stats_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3492CC1A1C6DF0830057D8E8 /* stats_cache.hpp */; };
 		34E44E701C4922E40057A5C4 /* intersection_result.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */; };
 		34E44E711C4922E40057A5C4 /* intersection_result.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */; };
 		34E44E741C4923100057A5C4 /* cbv_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34E44E721C4923100057A5C4 /* cbv_ptr.cpp */; };
 		34E44E751C4923100057A5C4 /* cbv_ptr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34E44E731C4923100057A5C4 /* cbv_ptr.hpp */; };
+		56D5456E1C74A48C00E3719C /* mode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56D5456C1C74A48C00E3719C /* mode.cpp */; };
+		56D5456F1C74A48C00E3719C /* mode.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56D5456D1C74A48C00E3719C /* mode.hpp */; };
+		56EB1ED51C6B6E130022D831 /* locality_scorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56EB1ED21C6B6E130022D831 /* locality_scorer.cpp */; };
+		56EB1ED61C6B6E130022D831 /* locality_scorer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED31C6B6E130022D831 /* locality_scorer.hpp */; };
+		56EB1ED71C6B6E130022D831 /* stats_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1ED41C6B6E130022D831 /* stats_cache.hpp */; };
 		670EE5631B600255001E8064 /* search_query_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE5601B600255001E8064 /* search_query_factory.hpp */; };
 		670EE5641B600255001E8064 /* search_query_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE5611B600255001E8064 /* search_query_params.cpp */; };
 		670EE5651B600255001E8064 /* search_query_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE5621B600255001E8064 /* search_query_params.hpp */; };
@@ -134,8 +130,6 @@
 
 /* Begin PBXFileReference section */
 		347F32FB1C4540A8009758CC /* cancel_exception.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cancel_exception.hpp; sourceTree = "<group>"; };
-		347F32FC1C4540A8009758CC /* categories_holder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_holder.cpp; sourceTree = "<group>"; };
-		347F32FD1C4540A8009758CC /* categories_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_holder.hpp; sourceTree = "<group>"; };
 		347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dummy_rank_table.cpp; sourceTree = "<group>"; };
 		347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dummy_rank_table.hpp; sourceTree = "<group>"; };
 		347F33001C4540A8009758CC /* interval_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interval_set.hpp; sourceTree = "<group>"; };
@@ -149,13 +143,9 @@
 		347F330A1C4540A8009758CC /* retrieval.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = retrieval.hpp; sourceTree = "<group>"; };
 		347F330B1C4540A8009758CC /* reverse_geocoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = reverse_geocoder.cpp; sourceTree = "<group>"; };
 		347F330C1C4540A8009758CC /* reverse_geocoder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reverse_geocoder.hpp; sourceTree = "<group>"; };
-		347F330D1C4540A8009758CC /* search_delimiters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_delimiters.cpp; sourceTree = "<group>"; };
-		347F330E1C4540A8009758CC /* search_delimiters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_delimiters.hpp; sourceTree = "<group>"; };
 		347F330F1C4540A8009758CC /* search_index_values.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_index_values.hpp; sourceTree = "<group>"; };
 		347F33101C4540A8009758CC /* search_query_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query_base.cpp; sourceTree = "<group>"; };
 		347F33111C4540A8009758CC /* search_query_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_base.hpp; sourceTree = "<group>"; };
-		347F33121C4540A8009758CC /* search_string_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_string_utils.cpp; sourceTree = "<group>"; };
-		347F33131C4540A8009758CC /* search_string_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_utils.hpp; sourceTree = "<group>"; };
 		347F33141C4540A8009758CC /* search_trie.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_trie.hpp; sourceTree = "<group>"; };
 		347F33151C4540A8009758CC /* suggest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suggest.hpp; sourceTree = "<group>"; };
 		347F333E1C45413C009758CC /* features_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_filter.cpp; sourceTree = "<group>"; };
@@ -182,13 +172,15 @@
 		347F33531C45413C009758CC /* search_query_v2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_v2.hpp; sourceTree = "<group>"; };
 		347F33541C45413C009758CC /* street_vicinity_loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_vicinity_loader.cpp; sourceTree = "<group>"; };
 		347F33551C45413C009758CC /* street_vicinity_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = street_vicinity_loader.hpp; sourceTree = "<group>"; };
-		3492CC181C6DF0830057D8E8 /* locality_scorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_scorer.cpp; sourceTree = "<group>"; };
-		3492CC191C6DF0830057D8E8 /* locality_scorer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_scorer.hpp; sourceTree = "<group>"; };
-		3492CC1A1C6DF0830057D8E8 /* stats_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats_cache.hpp; sourceTree = "<group>"; };
 		34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intersection_result.cpp; sourceTree = "<group>"; };
 		34E44E6F1C4922E40057A5C4 /* intersection_result.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = intersection_result.hpp; sourceTree = "<group>"; };
 		34E44E721C4923100057A5C4 /* cbv_ptr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cbv_ptr.cpp; sourceTree = "<group>"; };
 		34E44E731C4923100057A5C4 /* cbv_ptr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cbv_ptr.hpp; sourceTree = "<group>"; };
+		56D5456C1C74A48C00E3719C /* mode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mode.cpp; sourceTree = "<group>"; };
+		56D5456D1C74A48C00E3719C /* mode.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = mode.hpp; sourceTree = "<group>"; };
+		56EB1ED21C6B6E130022D831 /* locality_scorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_scorer.cpp; sourceTree = "<group>"; };
+		56EB1ED31C6B6E130022D831 /* locality_scorer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locality_scorer.hpp; sourceTree = "<group>"; };
+		56EB1ED41C6B6E130022D831 /* stats_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = stats_cache.hpp; sourceTree = "<group>"; };
 		670D05A31B0DF3C30013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		670EE5601B600255001E8064 /* search_query_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_factory.hpp; sourceTree = "<group>"; };
 		670EE5611B600255001E8064 /* search_query_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query_params.cpp; sourceTree = "<group>"; };
@@ -281,9 +273,9 @@
 		347F333D1C45413C009758CC /* v2 */ = {
 			isa = PBXGroup;
 			children = (
-				3492CC181C6DF0830057D8E8 /* locality_scorer.cpp */,
-				3492CC191C6DF0830057D8E8 /* locality_scorer.hpp */,
-				3492CC1A1C6DF0830057D8E8 /* stats_cache.hpp */,
+				56EB1ED21C6B6E130022D831 /* locality_scorer.cpp */,
+				56EB1ED31C6B6E130022D831 /* locality_scorer.hpp */,
+				56EB1ED41C6B6E130022D831 /* stats_cache.hpp */,
 				34E44E721C4923100057A5C4 /* cbv_ptr.cpp */,
 				34E44E731C4923100057A5C4 /* cbv_ptr.hpp */,
 				34E44E6E1C4922E40057A5C4 /* intersection_result.cpp */,
@@ -375,10 +367,10 @@
 		675346B21A4055CF00A0A8C3 /* search */ = {
 			isa = PBXGroup;
 			children = (
+				56D5456C1C74A48C00E3719C /* mode.cpp */,
+				56D5456D1C74A48C00E3719C /* mode.hpp */,
 				347F333D1C45413C009758CC /* v2 */,
 				347F32FB1C4540A8009758CC /* cancel_exception.hpp */,
-				347F32FC1C4540A8009758CC /* categories_holder.cpp */,
-				347F32FD1C4540A8009758CC /* categories_holder.hpp */,
 				347F32FE1C4540A8009758CC /* dummy_rank_table.cpp */,
 				347F32FF1C4540A8009758CC /* dummy_rank_table.hpp */,
 				347F33001C4540A8009758CC /* interval_set.hpp */,
@@ -392,13 +384,9 @@
 				347F330A1C4540A8009758CC /* retrieval.hpp */,
 				347F330B1C4540A8009758CC /* reverse_geocoder.cpp */,
 				347F330C1C4540A8009758CC /* reverse_geocoder.hpp */,
-				347F330D1C4540A8009758CC /* search_delimiters.cpp */,
-				347F330E1C4540A8009758CC /* search_delimiters.hpp */,
 				347F330F1C4540A8009758CC /* search_index_values.hpp */,
 				347F33101C4540A8009758CC /* search_query_base.cpp */,
 				347F33111C4540A8009758CC /* search_query_base.hpp */,
-				347F33121C4540A8009758CC /* search_string_utils.cpp */,
-				347F33131C4540A8009758CC /* search_string_utils.hpp */,
 				347F33141C4540A8009758CC /* search_trie.hpp */,
 				347F33151C4540A8009758CC /* suggest.hpp */,
 				A1347D4F1B8758C3009050FF /* query_saver.cpp */,
@@ -464,13 +452,13 @@
 				347F33231C4540A8009758CC /* region.hpp in Headers */,
 				347F33691C45413C009758CC /* search_model.hpp in Headers */,
 				347F33301C4540A8009758CC /* suggest.hpp in Headers */,
+				56D5456F1C74A48C00E3719C /* mode.hpp in Headers */,
 				347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */,
 				347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */,
 				347F33631C45413C009758CC /* house_to_street_table.hpp in Headers */,
 				347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */,
-				347F33291C4540A8009758CC /* search_delimiters.hpp in Headers */,
 				675346DE1A40560D00A0A8C3 /* approximate_string_match.hpp in Headers */,
-				3492CC1C1C6DF0830057D8E8 /* locality_scorer.hpp in Headers */,
+				56EB1ED61C6B6E130022D831 /* locality_scorer.hpp in Headers */,
 				675346F31A40560D00A0A8C3 /* search_common.hpp in Headers */,
 				675346EE1A40560D00A0A8C3 /* locality_finder.hpp in Headers */,
 				675346EC1A40560D00A0A8C3 /* latlon_match.hpp in Headers */,
@@ -482,9 +470,7 @@
 				347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */,
 				347F331B1C4540A8009758CC /* interval_set.hpp in Headers */,
 				670EE5651B600255001E8064 /* search_query_params.hpp in Headers */,
-				347F332E1C4540A8009758CC /* search_string_utils.hpp in Headers */,
 				675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */,
-				347F33181C4540A8009758CC /* categories_holder.hpp in Headers */,
 				675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */,
 				347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */,
 				347F335F1C45413C009758CC /* geocoder.hpp in Headers */,
@@ -495,7 +481,7 @@
 				675346DC1A40560D00A0A8C3 /* algos.hpp in Headers */,
 				675346E81A40560D00A0A8C3 /* keyword_lang_matcher.hpp in Headers */,
 				347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */,
-				3492CC1D1C6DF0830057D8E8 /* stats_cache.hpp in Headers */,
+				56EB1ED71C6B6E130022D831 /* stats_cache.hpp in Headers */,
 				675346F21A40560D00A0A8C3 /* result.hpp in Headers */,
 				347F33251C4540A8009758CC /* retrieval.hpp in Headers */,
 			);
@@ -611,11 +597,9 @@
 				347F33601C45413C009758CC /* house_numbers_matcher.cpp in Sources */,
 				347F33191C4540A8009758CC /* dummy_rank_table.cpp in Sources */,
 				675346F11A40560D00A0A8C3 /* result.cpp in Sources */,
-				347F332D1C4540A8009758CC /* search_string_utils.cpp in Sources */,
-				3492CC1B1C6DF0830057D8E8 /* locality_scorer.cpp in Sources */,
+				56EB1ED51C6B6E130022D831 /* locality_scorer.cpp in Sources */,
 				347F33581C45413C009758CC /* features_layer.cpp in Sources */,
 				347F33221C4540A8009758CC /* region.cpp in Sources */,
-				347F33281C4540A8009758CC /* search_delimiters.cpp in Sources */,
 				347F33641C45413C009758CC /* mwm_context.cpp in Sources */,
 				34E44E701C4922E40057A5C4 /* intersection_result.cpp in Sources */,
 				347F335A1C45413C009758CC /* features_layer_matcher.cpp in Sources */,
@@ -625,10 +609,10 @@
 				347F33661C45413C009758CC /* rank_table_cache.cpp in Sources */,
 				675346F41A40560D00A0A8C3 /* search_engine.cpp in Sources */,
 				347F33241C4540A8009758CC /* retrieval.cpp in Sources */,
-				347F33171C4540A8009758CC /* categories_holder.cpp in Sources */,
 				A1347D551B8758E9009050FF /* query_saver_tests.cpp in Sources */,
 				347F335E1C45413C009758CC /* geocoder.cpp in Sources */,
 				675346ED1A40560D00A0A8C3 /* locality_finder.cpp in Sources */,
+				56D5456E1C74A48C00E3719C /* mode.cpp in Sources */,
 				347F33681C45413C009758CC /* search_model.cpp in Sources */,
 				675346F61A40560D00A0A8C3 /* search_query.cpp in Sources */,
 				675346EB1A40560D00A0A8C3 /* latlon_match.cpp in Sources */,
diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index 1b595e6533..b2d74b6838 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B0931D1C61F9BA0066F4C3 /* storage_helpers.cpp */; };
+		34B093231C61F9BA0066F4C3 /* storage_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34B0931E1C61F9BA0066F4C3 /* storage_helpers.hpp */; };
+		34B093261C61F9BA0066F4C3 /* app_store.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34B093211C61F9BA0066F4C3 /* app_store.hpp */; };
 		67247FCF1C60BA8A00EDE56A /* fake_map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FC51C60BA8A00EDE56A /* fake_map_files_downloader.hpp */; };
 		67247FD41C60BA8A00EDE56A /* task_runner.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FCA1C60BA8A00EDE56A /* task_runner.hpp */; };
 		67247FD61C60BA8A00EDE56A /* test_map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FCC1C60BA8A00EDE56A /* test_map_files_downloader.hpp */; };
@@ -92,6 +95,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		34B0931D1C61F9BA0066F4C3 /* storage_helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_helpers.cpp; sourceTree = "<group>"; };
+		34B0931E1C61F9BA0066F4C3 /* storage_helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage_helpers.hpp; sourceTree = "<group>"; };
+		34B093211C61F9BA0066F4C3 /* app_store.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = app_store.hpp; sourceTree = "<group>"; };
 		670D05A81B0E04450013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
 		67247FBC1C60B89B00EDE56A /* storage_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = storage_tests; sourceTree = BUILT_PRODUCTS_DIR; };
 		67247FC31C60BA8A00EDE56A /* country_info_getter_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_getter_test.cpp; sourceTree = "<group>"; };
@@ -271,6 +277,9 @@
 		675342E21A3F59EF00A0A8C3 /* storage */ = {
 			isa = PBXGroup;
 			children = (
+				34B0931D1C61F9BA0066F4C3 /* storage_helpers.cpp */,
+				34B0931E1C61F9BA0066F4C3 /* storage_helpers.hpp */,
+				34B093211C61F9BA0066F4C3 /* app_store.hpp */,
 				67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */,
 				67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */,
 				674125181B4C05FA00A3E828 /* http_map_files_downloader.cpp */,
@@ -309,6 +318,7 @@
 				67247FD41C60BA8A00EDE56A /* task_runner.hpp in Headers */,
 				6753430F1A3F5A2600A0A8C3 /* country.hpp in Headers */,
 				675343181A3F5A2600A0A8C3 /* simple_tree.hpp in Headers */,
+				34B093261C61F9BA0066F4C3 /* app_store.hpp in Headers */,
 				6753430A1A3F5A2600A0A8C3 /* country_decl.hpp in Headers */,
 				67247FCF1C60BA8A00EDE56A /* fake_map_files_downloader.hpp in Headers */,
 				67AF4A011BC579DD0048B1ED /* country_info_getter.hpp in Headers */,
@@ -316,6 +326,7 @@
 				6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */,
 				67247FD61C60BA8A00EDE56A /* test_map_files_downloader.hpp in Headers */,
 				675343171A3F5A2600A0A8C3 /* index.hpp in Headers */,
+				34B093231C61F9BA0066F4C3 /* storage_helpers.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -445,6 +456,7 @@
 			files = (
 				6753430E1A3F5A2600A0A8C3 /* country.cpp in Sources */,
 				67AF4A001BC579DD0048B1ED /* country_info_getter.cpp in Sources */,
+				34B093221C61F9BA0066F4C3 /* storage_helpers.cpp in Sources */,
 				675343091A3F5A2600A0A8C3 /* country_decl.cpp in Sources */,
 				674125211B4C05FA00A3E828 /* queued_country.cpp in Sources */,
 				6753431A1A3F5A2600A0A8C3 /* storage.cpp in Sources */,
@@ -700,6 +712,7 @@
 				6724800C1C60CE3D00EDE56A /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		675342DB1A3F59EF00A0A8C3 /* Build configuration list for PBXProject "storage" */ = {
 			isa = XCConfigurationList;