diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index dc630e8b6..6bbd05830 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -40,7 +40,7 @@
 
 const TCHAR Notepad_plus::_className[32] = TEXT("Notepad++");
 HWND Notepad_plus::gNppHWND = NULL;
-const char *urlHttpRegExpr = "http://[a-z0-9_\\-\\+~.:?&@=/%#]*";
+const char *urlHttpRegExpr = "http://[a-z0-9_\\-\\+.:?&@=/%#]*";
 
 int docTabIconIDs[] = {IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON};
 enum tb_stat {tb_saved, tb_unsaved, tb_ro};
@@ -2753,7 +2753,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 		//Else forward notification to window of rebarband
 		REBARBANDINFO rbBand;
 		winVer winVersion = (NppParameters::getInstance())->getWinVersion();
-		if (winVersion <= WV_ME)
+		if (winVersion <= WV_W2K)
 		{
 			ZeroMemory(&rbBand, sizeof(REBARBANDINFO));
 			rbBand.cbSize  = sizeof(REBARBANDINFO);
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index 58eb27d0c..0603e0969 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -675,6 +675,7 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
 						_isInSelection = true;
 					}
 				}
+
 				// Searching/replacing in column selection is not allowed 
 				if ((*_ppEditView)->execute(SCI_GETSELECTIONMODE) == SC_SEL_RECTANGLE)
 				{
@@ -683,6 +684,12 @@ BOOL CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
 					nbSelected = 0;
 				}
 				::EnableWindow(::GetDlgItem(_hSelf, IDC_IN_SELECTION_CHECK), nbSelected);
+                // uncheck if the control is disable
+                if (!nbSelected)
+                {
+					checkVal = BST_UNCHECKED;
+					_isInSelection = false;
+                }
 				::SendDlgItemMessage(_hSelf, IDC_IN_SELECTION_CHECK, BM_SETCHECK, checkVal, 0);
 			}
 			
@@ -2034,7 +2041,7 @@ void FindIncrementDlg::addToRebar(ReBar * rebar)
 	getClientRect(client);
 
 	winVer winVersion = (NppParameters::getInstance())->getWinVersion();
-	if (winVersion <= WV_ME)
+	if (winVersion <= WV_W2K)
 	{
 		ZeroMemory(&_rbBand, sizeof(REBARBANDINFO));
 		_rbBand.cbSize  = sizeof(REBARBANDINFO);
diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
index 2c969c7a0..9d598947b 100644
--- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
+++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
@@ -261,7 +261,7 @@ void ToolBar::addToRebar(ReBar * rebar) {
 	_pRebar = rebar;
 
 	winVer winVersion = (NppParameters::getInstance())->getWinVersion();
-	if (winVersion <= WV_ME)
+	if (winVersion <= WV_W2K)
 	{
 		ZeroMemory(&_rbBand, sizeof(REBARBANDINFO));
 		_rbBand.cbSize  = sizeof(REBARBANDINFO);
@@ -347,7 +347,7 @@ void ReBar::setIDVisible(int id, bool show)
 
 	REBARBANDINFO rbBand;
 	winVer winVersion = (NppParameters::getInstance())->getWinVersion();
-	if (winVersion <= WV_ME)
+	if (winVersion <= WV_W2K)
 	{
 		ZeroMemory(&rbBand, sizeof(REBARBANDINFO));
 		rbBand.cbSize  = sizeof(REBARBANDINFO);
@@ -374,7 +374,7 @@ bool ReBar::getIDVisible(int id)
 		return false;	//error
 	REBARBANDINFO rbBand;
 	winVer winVersion = (NppParameters::getInstance())->getWinVersion();
-	if (winVersion <= WV_ME)
+	if (winVersion <= WV_W2K)
 	{
 		ZeroMemory(&rbBand, sizeof(REBARBANDINFO));
 		rbBand.cbSize  = sizeof(REBARBANDINFO);