diff --git a/indexer/indexer_tool/indexer_tool.cpp b/indexer/indexer_tool/indexer_tool.cpp
index f59ebb768d..53a2b6469f 100644
--- a/indexer/indexer_tool/indexer_tool.cpp
+++ b/indexer/indexer_tool/indexer_tool.cpp
@@ -30,11 +30,12 @@ DEFINE_bool(version, false, "Display version");
 DEFINE_bool(generate_update, false,
               "If specified, update.maps file will be generated from cells in the data path");
 
-DEFINE_bool(sort_features, false, "Sort features inside .dat for better cache-friendliness.");
+DEFINE_bool(sort_features, true, "Sort features data for better cache-friendliness.");
 DEFINE_bool(generate_classif, false, "Generate classificator.");
-DEFINE_bool(generate_intermediate_data, false, "Generate intermediate data.");
-DEFINE_bool(generate_final_data, false, "Generate final data.");
-DEFINE_bool(generate_index, false, "Generate index.");
+DEFINE_bool(preprocess_xml, false, "1st pass - create nodes/ways/relations data");
+DEFINE_bool(generate_features, false, "2nd pass - generate intermediate features");
+DEFINE_bool(generate_geometry, false, "3rd pass - split and simplify geometry and triangles for features");
+DEFINE_bool(generate_index, false, "4rd pass - generate index");
 DEFINE_bool(generate_grid, false, "Generate grid for given bucketing_level");
 DEFINE_bool(use_light_nodes, false,
             "If true, use temporary vector of nodes, instead of huge temp file");
@@ -88,7 +89,7 @@ int main(int argc, char ** argv)
   }
 
   // Generating intermediate files
-  if (FLAGS_generate_intermediate_data)
+  if (FLAGS_preprocess_xml)
   {
     LOG(LINFO, ("Generating intermediate data ...."));
     if (!data::GenerateToFile(FLAGS_intermediate_data_path, FLAGS_use_light_nodes))
@@ -99,7 +100,7 @@ int main(int argc, char ** argv)
   genInfo.dir = FLAGS_intermediate_data_path;
 
   // Generate dat file
-  if (FLAGS_generate_final_data)
+  if (FLAGS_generate_features)
   {
     LOG(LINFO, ("Generating final data ..."));
 
@@ -136,7 +137,7 @@ int main(int argc, char ** argv)
   {
     string const & datFile = genInfo.bucketNames[i];
 
-    if (FLAGS_sort_features)
+    if (FLAGS_generate_geometry)
     {
       LOG(LINFO, ("Generating result features for ", datFile));
       if (!feature::GenerateFinalFeatures(datFile, FLAGS_sort_features))