diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 2d1697ab..6600cb74 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -113,9 +113,9 @@ RootDir=C:\Programme\Borland\Delphi7\Bin\
 IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=1
-MinorVer=3
+MinorVer=4
 Release=0
-Build=36
+Build=1
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,13 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.3.0.36
-InternalName=
-LegalCopyright=
+FileVersion=1.4.0.1
+InternalName=gaben
+LegalCopyright=AMX Mod X Dev Team
 LegalTrademarks=
 OriginalFilename=
 ProductName=AMXX-Studio
-ProductVersion=1.2.0.0
+ProductVersion=1.4.0.0
 Comments=
 [HistoryLists\hlConditionals]
 Count=1
diff --git a/editor/studio/AMXX_Studio.dpr b/editor/studio/AMXX_Studio.dpr
index 962143b9..790478d2 100755
--- a/editor/studio/AMXX_Studio.dpr
+++ b/editor/studio/AMXX_Studio.dpr
@@ -47,7 +47,6 @@ uses
   - FlatStyle
   - Toolbar2000, TBX, SpTBX, mbTBX Lib
   - Scintilla and DelphiSci
-  - madExcept
 }
 
 {$R *.res}
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index 8254e5f9..e409a0d3 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 33f591ff..7a637e24 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitCodeUtils.pas b/editor/studio/UnitCodeUtils.pas
index aba9aa0d..9538eb75 100755
--- a/editor/studio/UnitCodeUtils.pas
+++ b/editor/studio/UnitCodeUtils.pas
@@ -456,10 +456,11 @@ var eStr: String;
 begin
   Result := 0;
   eStr := StringReplace(frmMain.sciEditor.Lines[frmMain.sciEditor.GetCurrentLineNumber], '^"', '', [rfReplaceAll]);
+  eStr := Copy(eStr, 1, frmMain.sciEditor.GetCaretInLine);
   while Between(eStr, '"', '"') <> '' do
     eStr := StringReplace(eStr, Between(eStr, '"', '"'), '', [rfReplaceAll]);
   while Between(eStr, '{', '}') <> '' do
-    eStr := StringReplace(eStr, Between(eStr, '"', '"'), '', [rfReplaceAll]);
+    eStr := StringReplace(eStr, Between(eStr, '{', '}'), '', [rfReplaceAll]);
   for i := 0 to Length(eStr) -1 do begin
     if eStr[i] = ',' then
       Result := Result +1;
diff --git a/editor/studio/UnitfrmInfo.dfm b/editor/studio/UnitfrmInfo.dfm
index c4fd6ba7..1750bae9 100755
Binary files a/editor/studio/UnitfrmInfo.dfm and b/editor/studio/UnitfrmInfo.dfm differ
diff --git a/editor/studio/UnitfrmMain.dfm b/editor/studio/UnitfrmMain.dfm
index f2833d1f..8cde54cb 100755
--- a/editor/studio/UnitfrmMain.dfm
+++ b/editor/studio/UnitfrmMain.dfm
@@ -756,7 +756,6 @@ object frmMain: TfrmMain
           Align = alClient
           OnModified = sciEditorModified
           OnDblClick = sciEditorDblClick
-          OnCallTipClick = sciEditorCallTipClick
           OnKeyUp = sciEditorKeyUp
           OnKeyDown = sciEditorKeyDown
           OnKeyPress = sciEditorKeyPress
@@ -7781,7 +7780,7 @@ object frmMain: TfrmMain
     OnBeforeShow = sciAutoCompleteBeforeShow
     MaxWidth = 0
     MaxHeight = 5
-    Left = 842
+    Left = 844
     Top = 6
   end
   object ppmDocuments: TSpTBXPopupMenu
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index a59fde7a..bc0235fd 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -1204,12 +1204,15 @@ begin
   if frmReplace.ShowModal = mrOk then begin
     if not Plugin_SearchReplace(frmReplace.cboSearchFor.Text, frmReplace.cboReplaceWith.Text, frmReplace.cboSearchFor.Items.Text, frmReplace.cboReplaceWith.Items.Text, frmSearch.chkCaseSensivity.Checked, frmSearch.chkWholeWordsOnly.Checked, frmSearch.chkSearchFromCaret.Checked, frmSearch.chkSelectedTextOnly.Checked, frmSearch.chkRegularExpression.Checked, frmSearch.chkForward.Checked) then
       exit;
+
     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;
+      // I don't like this but it works so far
+      if (frmReplace.chkReplaceAll.Checked) and (Pos(LowerCase(frmReplace.cboSearchFor.Text), LowerCase(frmReplace.cboReplaceWith.Text)) <> 0) then
+        SearchFromCaret := True
+      else
+        SearchFromCaret := frmReplace.chkSearchFromCaret.Checked;
       SearchSelectionOnly := frmReplace.chkSelectedTextOnly.Checked;
       SearchWholeWords := frmReplace.chkWholeWordsOnly.Checked;
       SearchRegex := frmReplace.chkRegularExpression.Checked;
@@ -1991,7 +1994,8 @@ begin
         for i := 0 to eACList.Count -1 do begin
           if eFunction = LowerCase(Trim(TACFunction(eACList.Items[i]).Name)) then begin
             if TACFunction(eACList.Items[i]).Items.Count > GetFunctionPos then begin
-              ListToDisplay.Text := StringReplace(TACFunction(eACList.Items[i]).Items[GetFunctionPos], '; ', #13, [rfReplaceAll]);
+              if Trim(TACFunction(eACList.Items[i]).Items[GetFunctionPos]) <> '' then
+                ListToDisplay.Text := StringReplace(TACFunction(eACList.Items[i]).Items[GetFunctionPos], '; ', #13, [rfReplaceAll]);
               break;
             end;
           end;