[ios] Fixed xc scheme build.

2 files changed, 36 insertions, 28 deletions

diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj
index 85c025850f..4283f84199 100644
--- a/xcode/editor/editor.xcodeproj/project.pbxproj
+++ b/xcode/editor/editor.xcodeproj/project.pbxproj
@@ -15,6 +15,8 @@
 		341138791C15AE42002E3B3E /* opening_hours_ui.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 341138751C15AE42002E3B3E /* opening_hours_ui.hpp */; };
 		3411387A1C15AE42002E3B3E /* ui2oh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 341138761C15AE42002E3B3E /* ui2oh.cpp */; };
 		3411387B1C15AE42002E3B3E /* ui2oh.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 341138771C15AE42002E3B3E /* ui2oh.hpp */; };
+		3441CE481CFC1D3C00CF30D4 /* user_stats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE461CFC1D3C00CF30D4 /* user_stats.cpp */; };
+		3441CE491CFC1D3C00CF30D4 /* user_stats.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE471CFC1D3C00CF30D4 /* user_stats.hpp */; };
 		34527C511C89B1770015050E /* editor_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34527C4F1C89B1770015050E /* editor_config.cpp */; };
 		34527C521C89B1770015050E /* editor_config.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34527C501C89B1770015050E /* editor_config.hpp */; };
 		34583BC01C8854C100F94664 /* yes_no_unknown.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34583BBE1C8854C100F94664 /* yes_no_unknown.hpp */; };
@@ -39,6 +41,8 @@
 		341138751C15AE42002E3B3E /* opening_hours_ui.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = opening_hours_ui.hpp; sourceTree = "<group>"; };
 		341138761C15AE42002E3B3E /* ui2oh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ui2oh.cpp; sourceTree = "<group>"; };
 		341138771C15AE42002E3B3E /* ui2oh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ui2oh.hpp; sourceTree = "<group>"; };
+		3441CE461CFC1D3C00CF30D4 /* user_stats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_stats.cpp; sourceTree = "<group>"; };
+		3441CE471CFC1D3C00CF30D4 /* user_stats.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_stats.hpp; sourceTree = "<group>"; };
 		34527C4F1C89B1770015050E /* editor_config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_config.cpp; sourceTree = "<group>"; };
 		34527C501C89B1770015050E /* editor_config.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_config.hpp; sourceTree = "<group>"; };
 		34583BBE1C8854C100F94664 /* yes_no_unknown.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = yes_no_unknown.hpp; sourceTree = "<group>"; };
@@ -83,6 +87,8 @@
 		341138731C15AE02002E3B3E /* Editor */ = {
 			isa = PBXGroup;
 			children = (
+				3441CE461CFC1D3C00CF30D4 /* user_stats.cpp */,
+				3441CE471CFC1D3C00CF30D4 /* user_stats.hpp */,
 				F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */,
 				F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */,
 				34527C4F1C89B1770015050E /* editor_config.cpp */,
@@ -123,6 +129,7 @@
 				340C20DF1C3E4DFD00111D22 /* osm_auth.hpp in Headers */,
 				34527C521C89B1770015050E /* editor_config.hpp in Headers */,
 				3411387B1C15AE42002E3B3E /* ui2oh.hpp in Headers */,
+				3441CE491CFC1D3C00CF30D4 /* user_stats.hpp in Headers */,
 				341138791C15AE42002E3B3E /* opening_hours_ui.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -189,6 +196,7 @@
 				3411387A1C15AE42002E3B3E /* ui2oh.cpp in Sources */,
 				340DC8291C4E71E500EAA2CC /* changeset_wrapper.cpp in Sources */,
 				34EB091F1C5F846900F47F1F /* osm_feature_matcher.cpp in Sources */,
+				3441CE481CFC1D3C00CF30D4 /* user_stats.cpp in Sources */,
 				34527C511C89B1770015050E /* editor_config.cpp in Sources */,
 				34FFB34C1C316A7600BFF6C3 /* server_api.cpp in Sources */,
 				F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */,
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index b7191e0796..ba8a38819d 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -11,6 +11,13 @@
 		3400A67E1CA27774003DA0EC /* geometry_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3400A67C1CA27774003DA0EC /* geometry_cache.hpp */; };
 		341F6D8B1CCE13C3003F4DB2 /* token_slice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 341F6D871CCE13C2003F4DB2 /* token_slice.cpp */; };
 		341F6D8C1CCE13C3003F4DB2 /* token_slice.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 341F6D881CCE13C2003F4DB2 /* token_slice.hpp */; };
+		3441CE441CFC1D1300CF30D4 /* processor_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE421CFC1D1300CF30D4 /* processor_v2.cpp */; };
+		3441CE451CFC1D1300CF30D4 /* processor_v2.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE431CFC1D1300CF30D4 /* processor_v2.hpp */; };
+		3441CE4F1CFC1D7000CF30D4 /* processor_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */; };
+		3441CE501CFC1D7000CF30D4 /* processor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE4B1CFC1D7000CF30D4 /* processor.cpp */; };
+		3441CE511CFC1D7000CF30D4 /* processor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4C1CFC1D7000CF30D4 /* processor.hpp */; };
+		3441CE521CFC1D7000CF30D4 /* query_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3441CE4D1CFC1D7000CF30D4 /* query_params.cpp */; };
+		3441CE531CFC1D7000CF30D4 /* query_params.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4E1CFC1D7000CF30D4 /* query_params.hpp */; };
 		34527C581C89D6240015050E /* pre_ranking_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34527C541C89D6240015050E /* pre_ranking_info.hpp */; };
 		34527C591C89D6240015050E /* ranking_info.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34527C551C89D6240015050E /* ranking_info.cpp */; };
 		34527C5A1C89D6240015050E /* ranking_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34527C561C89D6240015050E /* ranking_info.hpp */; };
@@ -53,8 +60,6 @@
 		347F33671C45413C009758CC /* rank_table_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F334F1C45413C009758CC /* rank_table_cache.hpp */; };
 		347F33681C45413C009758CC /* search_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33501C45413C009758CC /* search_model.cpp */; };
 		347F33691C45413C009758CC /* search_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 347F33511C45413C009758CC /* search_model.hpp */; };
-		347F336A1C45413C009758CC /* search_query_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347F33521C45413C009758CC /* search_query_v2.cpp */; };
-		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 */; };
 		34C0C4171C9AE1FA00FDA0D1 /* nested_rects_cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C0C4151C9AE1FA00FDA0D1 /* nested_rects_cache.cpp */; };
@@ -68,9 +73,6 @@
 		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 */; };
 		670F88741CE4C032003F68BA /* types_skipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670F88721CE4C032003F68BA /* types_skipper.cpp */; };
 		670F88751CE4C032003F68BA /* types_skipper.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670F88731CE4C032003F68BA /* types_skipper.hpp */; };
 		671C621C1AE9227C00076BD0 /* algos_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62131AE9227C00076BD0 /* algos_tests.cpp */; };
@@ -118,8 +120,6 @@
 		675346F31A40560D00A0A8C3 /* search_common.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D51A40560D00A0A8C3 /* search_common.hpp */; };
 		675346F41A40560D00A0A8C3 /* search_engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346D61A40560D00A0A8C3 /* search_engine.cpp */; };
 		675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D71A40560D00A0A8C3 /* search_engine.hpp */; };
-		675346F61A40560D00A0A8C3 /* search_query.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675346D81A40560D00A0A8C3 /* search_query.cpp */; };
-		675346F71A40560D00A0A8C3 /* search_query.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346D91A40560D00A0A8C3 /* search_query.hpp */; };
 		675346F81A40560D00A0A8C3 /* search_string_intersection.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */; };
 		A1347D511B8758C3009050FF /* query_saver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1347D4F1B8758C3009050FF /* query_saver.cpp */; };
 		A1347D521B8758C3009050FF /* query_saver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1347D501B8758C3009050FF /* query_saver.hpp */; };
@@ -145,6 +145,13 @@
 		3400A67C1CA27774003DA0EC /* geometry_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geometry_cache.hpp; sourceTree = "<group>"; };
 		341F6D871CCE13C2003F4DB2 /* token_slice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = token_slice.cpp; sourceTree = "<group>"; };
 		341F6D881CCE13C2003F4DB2 /* token_slice.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = token_slice.hpp; sourceTree = "<group>"; };
+		3441CE421CFC1D1300CF30D4 /* processor_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor_v2.cpp; sourceTree = "<group>"; };
+		3441CE431CFC1D1300CF30D4 /* processor_v2.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_v2.hpp; sourceTree = "<group>"; };
+		3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_factory.hpp; sourceTree = "<group>"; };
+		3441CE4B1CFC1D7000CF30D4 /* processor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = processor.cpp; sourceTree = "<group>"; };
+		3441CE4C1CFC1D7000CF30D4 /* processor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor.hpp; sourceTree = "<group>"; };
+		3441CE4D1CFC1D7000CF30D4 /* query_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_params.cpp; sourceTree = "<group>"; };
+		3441CE4E1CFC1D7000CF30D4 /* query_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = query_params.hpp; sourceTree = "<group>"; };
 		34527C541C89D6240015050E /* pre_ranking_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pre_ranking_info.hpp; sourceTree = "<group>"; };
 		34527C551C89D6240015050E /* ranking_info.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ranking_info.cpp; sourceTree = "<group>"; };
 		34527C561C89D6240015050E /* ranking_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ranking_info.hpp; sourceTree = "<group>"; };
@@ -187,8 +194,6 @@
 		347F334F1C45413C009758CC /* rank_table_cache.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rank_table_cache.hpp; sourceTree = "<group>"; };
 		347F33501C45413C009758CC /* search_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_model.cpp; sourceTree = "<group>"; };
 		347F33511C45413C009758CC /* search_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_model.hpp; sourceTree = "<group>"; };
-		347F33521C45413C009758CC /* search_query_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query_v2.cpp; sourceTree = "<group>"; };
-		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>"; };
 		34C0C4151C9AE1FA00FDA0D1 /* nested_rects_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nested_rects_cache.cpp; sourceTree = "<group>"; };
@@ -203,9 +208,6 @@
 		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>"; };
-		670EE5621B600255001E8064 /* search_query_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query_params.hpp; sourceTree = "<group>"; };
 		670F88721CE4C032003F68BA /* types_skipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = types_skipper.cpp; sourceTree = "<group>"; };
 		670F88731CE4C032003F68BA /* types_skipper.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types_skipper.hpp; sourceTree = "<group>"; };
 		671C620C1AE9225100076BD0 /* search_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = search_tests; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -255,8 +257,6 @@
 		675346D51A40560D00A0A8C3 /* search_common.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_common.hpp; sourceTree = "<group>"; };
 		675346D61A40560D00A0A8C3 /* search_engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_engine.cpp; sourceTree = "<group>"; };
 		675346D71A40560D00A0A8C3 /* search_engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_engine.hpp; sourceTree = "<group>"; };
-		675346D81A40560D00A0A8C3 /* search_query.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = search_query.cpp; sourceTree = "<group>"; };
-		675346D91A40560D00A0A8C3 /* search_query.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_query.hpp; sourceTree = "<group>"; };
 		675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = search_string_intersection.hpp; sourceTree = "<group>"; };
 		A1347D4F1B8758C3009050FF /* query_saver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = query_saver.cpp; sourceTree = "<group>"; };
 		A1347D501B8758C3009050FF /* query_saver.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = query_saver.hpp; sourceTree = "<group>"; };
@@ -297,6 +297,8 @@
 		347F333D1C45413C009758CC /* v2 */ = {
 			isa = PBXGroup;
 			children = (
+				3441CE421CFC1D1300CF30D4 /* processor_v2.cpp */,
+				3441CE431CFC1D1300CF30D4 /* processor_v2.hpp */,
 				341F6D871CCE13C2003F4DB2 /* token_slice.cpp */,
 				341F6D881CCE13C2003F4DB2 /* token_slice.hpp */,
 				3400A67B1CA27774003DA0EC /* geometry_cache.cpp */,
@@ -335,8 +337,6 @@
 				347F334F1C45413C009758CC /* rank_table_cache.hpp */,
 				347F33501C45413C009758CC /* search_model.cpp */,
 				347F33511C45413C009758CC /* search_model.hpp */,
-				347F33521C45413C009758CC /* search_query_v2.cpp */,
-				347F33531C45413C009758CC /* search_query_v2.hpp */,
 				347F33541C45413C009758CC /* street_vicinity_loader.cpp */,
 				347F33551C45413C009758CC /* street_vicinity_loader.hpp */,
 			);
@@ -402,6 +402,11 @@
 		675346B21A4055CF00A0A8C3 /* search */ = {
 			isa = PBXGroup;
 			children = (
+				3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */,
+				3441CE4B1CFC1D7000CF30D4 /* processor.cpp */,
+				3441CE4C1CFC1D7000CF30D4 /* processor.hpp */,
+				3441CE4D1CFC1D7000CF30D4 /* query_params.cpp */,
+				3441CE4E1CFC1D7000CF30D4 /* query_params.hpp */,
 				F659FC6B1CF4A30B000A06B1 /* pre_ranker.cpp */,
 				F659FC6C1CF4A30B000A06B1 /* pre_ranker.hpp */,
 				670F88721CE4C032003F68BA /* types_skipper.cpp */,
@@ -453,11 +458,6 @@
 				675346D51A40560D00A0A8C3 /* search_common.hpp */,
 				675346D61A40560D00A0A8C3 /* search_engine.cpp */,
 				675346D71A40560D00A0A8C3 /* search_engine.hpp */,
-				675346D81A40560D00A0A8C3 /* search_query.cpp */,
-				675346D91A40560D00A0A8C3 /* search_query.hpp */,
-				670EE5601B600255001E8064 /* search_query_factory.hpp */,
-				670EE5611B600255001E8064 /* search_query_params.cpp */,
-				670EE5621B600255001E8064 /* search_query_params.hpp */,
 				675346DA1A40560D00A0A8C3 /* search_string_intersection.hpp */,
 			);
 			name = search;
@@ -477,13 +477,10 @@
 				675346F81A40560D00A0A8C3 /* search_string_intersection.hpp in Headers */,
 				347F33671C45413C009758CC /* rank_table_cache.hpp in Headers */,
 				347F332F1C4540A8009758CC /* search_trie.hpp in Headers */,
-				670EE5631B600255001E8064 /* search_query_factory.hpp in Headers */,
-				675346F71A40560D00A0A8C3 /* search_query.hpp in Headers */,
 				F659FC6E1CF4A30B000A06B1 /* pre_ranker.hpp in Headers */,
 				675346E11A40560D00A0A8C3 /* geometry_utils.hpp in Headers */,
 				675346E31A40560D00A0A8C3 /* house_detector.hpp in Headers */,
 				675346E61A40560D00A0A8C3 /* intermediate_result.hpp in Headers */,
-				347F336B1C45413C009758CC /* search_query_v2.hpp in Headers */,
 				347F335D1C45413C009758CC /* features_layer_path_finder.hpp in Headers */,
 				347F33611C45413C009758CC /* house_numbers_matcher.hpp in Headers */,
 				347F33231C4540A8009758CC /* region.hpp in Headers */,
@@ -495,6 +492,7 @@
 				347F33631C45413C009758CC /* house_to_street_table.hpp in Headers */,
 				347F335B1C45413C009758CC /* features_layer_matcher.hpp in Headers */,
 				34527C581C89D6240015050E /* pre_ranking_info.hpp in Headers */,
+				3441CE4F1CFC1D7000CF30D4 /* processor_factory.hpp in Headers */,
 				675346DE1A40560D00A0A8C3 /* approximate_string_match.hpp in Headers */,
 				56EB1ED61C6B6E130022D831 /* locality_scorer.hpp in Headers */,
 				3400A67E1CA27774003DA0EC /* geometry_cache.hpp in Headers */,
@@ -509,7 +507,6 @@
 				34527C5A1C89D6240015050E /* ranking_info.hpp in Headers */,
 				347F33211C4540A8009758CC /* projection_on_street.hpp in Headers */,
 				347F331B1C4540A8009758CC /* interval_set.hpp in Headers */,
-				670EE5651B600255001E8064 /* search_query_params.hpp in Headers */,
 				675346DF1A40560D00A0A8C3 /* feature_offset_match.hpp in Headers */,
 				675346F51A40560D00A0A8C3 /* search_engine.hpp in Headers */,
 				347F331A1C4540A8009758CC /* dummy_rank_table.hpp in Headers */,
@@ -517,9 +514,12 @@
 				34E44E711C4922E40057A5C4 /* intersection_result.hpp in Headers */,
 				347F33571C45413C009758CC /* features_filter.hpp in Headers */,
 				345FBED01C8045EB00831ED6 /* ranking_utils.hpp in Headers */,
+				3441CE511CFC1D7000CF30D4 /* processor.hpp in Headers */,
 				341F6D8C1CCE13C3003F4DB2 /* token_slice.hpp in Headers */,
 				347F33651C45413C009758CC /* mwm_context.hpp in Headers */,
+				3441CE531CFC1D7000CF30D4 /* query_params.hpp in Headers */,
 				675346DC1A40560D00A0A8C3 /* algos.hpp in Headers */,
+				3441CE451CFC1D1300CF30D4 /* processor_v2.hpp in Headers */,
 				34C0C4181C9AE1FA00FDA0D1 /* nested_rects_cache.hpp in Headers */,
 				675346E81A40560D00A0A8C3 /* keyword_lang_matcher.hpp in Headers */,
 				347F33271C4540A8009758CC /* reverse_geocoder.hpp in Headers */,
@@ -630,10 +630,8 @@
 				34C0C4171C9AE1FA00FDA0D1 /* nested_rects_cache.cpp in Sources */,
 				347F335C1C45413C009758CC /* features_layer_path_finder.cpp in Sources */,
 				347F33261C4540A8009758CC /* reverse_geocoder.cpp in Sources */,
-				670EE5641B600255001E8064 /* search_query_params.cpp in Sources */,
 				A1347D511B8758C3009050FF /* query_saver.cpp in Sources */,
 				347F33561C45413C009758CC /* features_filter.cpp in Sources */,
-				347F336A1C45413C009758CC /* search_query_v2.cpp in Sources */,
 				675346E01A40560D00A0A8C3 /* geometry_utils.cpp in Sources */,
 				341F6D8B1CCE13C3003F4DB2 /* token_slice.cpp in Sources */,
 				34E44E741C4923100057A5C4 /* cbv_ptr.cpp in Sources */,
@@ -645,7 +643,9 @@
 				56EB1ED51C6B6E130022D831 /* locality_scorer.cpp in Sources */,
 				347F33581C45413C009758CC /* features_layer.cpp in Sources */,
 				347F33221C4540A8009758CC /* region.cpp in Sources */,
+				3441CE501CFC1D7000CF30D4 /* processor.cpp in Sources */,
 				34527C591C89D6240015050E /* ranking_info.cpp in Sources */,
+				3441CE441CFC1D1300CF30D4 /* processor_v2.cpp in Sources */,
 				347F33641C45413C009758CC /* mwm_context.cpp in Sources */,
 				34E44E701C4922E40057A5C4 /* intersection_result.cpp in Sources */,
 				3400A67D1CA27774003DA0EC /* geometry_cache.cpp in Sources */,
@@ -660,8 +660,8 @@
 				347F335E1C45413C009758CC /* geocoder.cpp in Sources */,
 				675346ED1A40560D00A0A8C3 /* locality_finder.cpp in Sources */,
 				56D5456E1C74A48C00E3719C /* mode.cpp in Sources */,
+				3441CE521CFC1D7000CF30D4 /* query_params.cpp in Sources */,
 				347F33681C45413C009758CC /* search_model.cpp in Sources */,
-				675346F61A40560D00A0A8C3 /* search_query.cpp in Sources */,
 				670F88741CE4C032003F68BA /* types_skipper.cpp in Sources */,
 				675346EB1A40560D00A0A8C3 /* latlon_match.cpp in Sources */,
 				675346E91A40560D00A0A8C3 /* keyword_matcher.cpp in Sources */,