diff --git a/Build/Changes.txt b/Build/Changes.txt
index 16ec5e4d8..d724658e1 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.1023.(build_#) (2021-10-23)
+Current BETA/RC Version 5.21.1030.(build_#) (2021-10-30)
 ========================================================
 
 --------------------------------------------------------
@@ -69,6 +69,8 @@ CHANGES Versions in Tools or Libraries:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[1030.1]- Wrong format for reporting number of replaced occurrences "In Selection".
+[1030.1]- "grepWinNP3" not intended switching file size search settings (GRE).
 [1023.1]- Key "Favorites=(path)" not added in "Setup" version.
 [1021.1]- "grepWinNP3" not intended switching "AllSize" settings (GRE).
 [1021.1]- Don't save default values for Caret and Whitespace.
diff --git a/Versions/day.txt b/Versions/day.txt
index b70608fe8..e445c3bb2 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-1023
+1030
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 00fbd6a2a..579a42683 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Rizonesoft.Notepad3"
     processorArchitecture="*"
-    version="5.21.1023.1"
+    version="5.21.1030.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 63b2ead0b..c34af2d8d 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -4629,7 +4629,7 @@ grepWin_t;
 
 static grepWin_t grepWinIniSettings[13] = {
     { L"onlyone",           L"1" },
-    { L"AllSize",           L"1" },
+    { L"AllSize",           L"0" },
     { L"Size",           L"2000" },
     { L"CaseSensitive",     L"0" },
     { L"CreateBackup",      L"1" },
diff --git a/src/VersionEx.h b/src/VersionEx.h
index dd4133b37..ec48c2025 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
-#define VERSION_REV 1023
+#define VERSION_REV 1030
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 511
 #define LEXILLA_VER 511