diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 050e4b7f..c878e273 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=3
 Release=0
-Build=29
+Build=30
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.3.0.29
+FileVersion=1.3.0.30
 InternalName=
 LegalCopyright=
 LegalTrademarks=
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index cee6b2c9..24d4c7c9 100755
Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ
diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res
index 77dbece6..32ba4e68 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitCodeExplorerUpdater.pas b/editor/studio/UnitCodeExplorerUpdater.pas
index 6c9389b5..bad7631a 100755
--- a/editor/studio/UnitCodeExplorerUpdater.pas
+++ b/editor/studio/UnitCodeExplorerUpdater.pas
@@ -169,47 +169,47 @@ begin
 
   // Get Expanded-State and delete children
     with GetNode('Constants') do begin
-      exConstants := Expanded;
+      exConstants := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('CVars') do begin
-      exCVars := Expanded;
+      exCVars := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Defined') do begin
-      exDefined := Expanded;
+      exDefined := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Included') do begin
-      exIncluded := Expanded;
+      exIncluded := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Default') do begin
-      exDefault := Expanded;
+      exDefault := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Events') do begin
-      exEvents := Expanded;
+      exEvents := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Stocks') do begin
-      exStocks := Expanded;
+      exStocks := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Methods') do begin
-      exMethods := Expanded;
+      exMethods := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Natives') do begin
-      exNatives := Expanded;
+      exNatives := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Forwards') do begin
-      exForwards := Expanded;
+      exForwards := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
     with GetNode('Variables') do begin
-      exVariables := Expanded;
+      exVariables := (Expanded) and (Count <> 0);
       DeleteChildren;
     end;
   // Create new children
diff --git a/editor/studio/UnitTextAnalyze.pas b/editor/studio/UnitTextAnalyze.pas
index c6a32768..f47744f8 100755
--- a/editor/studio/UnitTextAnalyze.pas
+++ b/editor/studio/UnitTextAnalyze.pas
@@ -279,6 +279,12 @@ begin
           if Pos('(', eTemp) <> 0 then
             eTemp := Copy(eTemp, 1, Pos('(', eTemp) - 1);
           eTemp := Trim(eTemp);
+          
+          if (Result.AutoComplete.IndexOf(eTemp) <> -1) then begin
+            eStartLine := -1;
+            eBracesOpen := 0;
+            continue;
+          end;
 
           if k < 5 then begin
             Result.AutoComplete.Add(eTemp);
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index bb963177..8233531a 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -1199,6 +1199,8 @@ begin
     with sciSearchReplace do begin
       SearchBackwards := frmReplace.chkBackward.Checked;
       SearchCaseSensitive := frmReplace.chkCaseSensivity.Checked;
+      if (frmReplace.chkReplaceAll.Checked) and (LowerCase(frmReplace.cboSearchFor.Text) = LowerCase(frmReplace.cboReplaceWith.Text)) then
+        SearchCaseSensitive := True;
       SearchFromCaret := frmReplace.chkSearchFromCaret.Checked;
       SearchSelectionOnly := frmReplace.chkSelectedTextOnly.Checked;
       SearchWholeWords := frmReplace.chkWholeWordsOnly.Checked;