diff --git a/tools/win/calc_statistics.bat b/tools/win/calc_statistics.bat
index 2192ad9b73..9e81fe4005 100644
--- a/tools/win/calc_statistics.bat
+++ b/tools/win/calc_statistics.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%GENERATOR_TOOL% --calc_statistics=true --output=%2 --bucketing_level=0
+%GENERATOR_TOOL% --calc_statistics=true --output=%2
diff --git a/tools/win/gen_all.bat b/tools/win/gen_all.bat
index 5b6335d5dd..1683a090a6 100644
--- a/tools/win/gen_all.bat
+++ b/tools/win/gen_all.bat
@@ -2,3 +2,4 @@ call process_xml.bat %1 %2
 call gen_features.bat %1 %2
 call gen_geometry %1 %2
 call gen_index %1 %2
+call gen_search_index %1 %2
diff --git a/tools/win/gen_features_world.bat b/tools/win/gen_features_world.bat
deleted file mode 100644
index 1aefd9f67f..0000000000
--- a/tools/win/gen_features_world.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-call set_vars.bat %1 %2
-
-%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --generate_features=true --use_light_nodes=true --split_by_polygons=true --generate_world=true --intermediate_data_path=D:\Temp\
diff --git a/tools/win/gen_geometry_world.bat b/tools/win/gen_geometry_world.bat
deleted file mode 100644
index 5def349612..0000000000
--- a/tools/win/gen_geometry_world.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-call set_vars.bat %1 %2
-
-%GENERATOR_TOOL% --generate_geometry=true --generate_world=true --output=World
diff --git a/tools/win/gen_index_world.bat b/tools/win/gen_index_world.bat
deleted file mode 100644
index 28d45bb862..0000000000
--- a/tools/win/gen_index_world.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-call set_vars.bat %1 %2
-
-%GENERATOR_TOOL% --generate_index=true --intermediate_data_path=D:\Temp\ --output=World
diff --git a/tools/win/gen_world.bat b/tools/win/gen_world.bat
index 867d723e0e..223de0bb73 100644
--- a/tools/win/gen_world.bat
+++ b/tools/win/gen_world.bat
@@ -1,4 +1,4 @@
-call process_xml.bat %1 %2
-call gen_features_world.bat %1 %2
-call gen_geometry_world.bat %1 %2
-call gen_index_world.bat %1 %2
+call set_vars.bat %1 %2
+
+%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --make_coasts --use_light_nodes --intermediate_data_path=D:\Temp\ 
+%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --emit_coasts --generate_features --generate_geometry --generate_index --split_by_polygons --generate_world --use_light_nodes --intermediate_data_path=D:\Temp\ 
diff --git a/tools/win/process_xml.bat b/tools/win/process_xml.bat
index 649ae0f63d..dcd8e7b782 100644
--- a/tools/win/process_xml.bat
+++ b/tools/win/process_xml.bat
@@ -1,3 +1,3 @@
 call set_vars.bat %1 %2
 
-%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --preprocess_xml=true --generate_features=false --generate_geometry=false --use_light_nodes=true --generate_index=false --intermediate_data_path=D:\Temp\
+%UNZIP_TOOL% -dc %OSM_FILE% | %GENERATOR_TOOL% --preprocess_xml=true --use_light_nodes=true --intermediate_data_path=D:\Temp\