diff --git a/uppsrc/CodeEditor/Highlight.cpp b/uppsrc/CodeEditor/Highlight.cpp
index 003445d94..b40a1e787 100644
--- a/uppsrc/CodeEditor/Highlight.cpp
+++ b/uppsrc/CodeEditor/Highlight.cpp
@@ -552,7 +552,7 @@ void CodeEditor::HighlightLine(int line, Vector<LineEdit::Highlight>& hl, int po
 				hls.SetPaper(hls.pos, text.GetLength() + 1 - hls.pos, BlockColor(--block_level));
 			Bracket(int(p - text) + pos, hls);
 			int& l = *p == ')' ? ss.pl : *p == '}' ? ss.cl : ss.bl;
-			if(bl == 0 || bc && (bc != *p || l <= 0) || !bc && *p != '}') {
+			if(bc && (bc != *p || l <= 0) || bc == 0 && *p != '}') {
 				hls.Put(p == ~text ? hl_style[INK_PAR0] : hl_style[INK_ERROR]);
 				ss.brk.Clear();
 				ss.cl = ss.bl = ss.pl = 0;
diff --git a/uppsrc/CodeEditor/Syntax.cpp b/uppsrc/CodeEditor/Syntax.cpp
index 67fb4ae28..819159500 100644
--- a/uppsrc/CodeEditor/Syntax.cpp
+++ b/uppsrc/CodeEditor/Syntax.cpp
@@ -274,7 +274,7 @@ void CodeEditor::SyntaxState::ScanSyntax(const wchar *ln, const wchar *e)
 					else
 					if(c == '}') {
 						if(brk.GetCount()) {
-							if(brk.Top() == '}') {
+							if(brk.Top()) {
 								cl--;
 								if(bid.GetCount() > 1)
 									bid.Drop();
@@ -369,7 +369,9 @@ bool CodeEditor::SyntaxState::MatchHilite(const SyntaxState& st) const
 	return comment == st.comment
 	    && linecont == st.linecont
 	    && linecomment == st.linecomment
+	    && string == st.string
 		&& macro == st.macro
+		&& was_namespace == st.was_namespace
 		&& cl == st.cl && bl == st.bl && pl == st.pl
 		&& IsEqual(brk, st.brk)
 		&& IsEqual(blk, st.blk)
diff --git a/uppsrc/ide/Browser/Browser.upp b/uppsrc/ide/Browser/Browser.upp
index a921d48e8..9971f87bb 100644
--- a/uppsrc/ide/Browser/Browser.upp
+++ b/uppsrc/ide/Browser/Browser.upp
@@ -1,4 +1,4 @@
-description "TheIDE - code browser and Topic++\377";
+description "TheIDE - code browser and Topic++\377B";
 
 uses
 	CppBase,
diff --git a/uppsrc/ide/Browser/CodeBrowser.cpp b/uppsrc/ide/Browser/CodeBrowser.cpp
index 36cbf5e90..b0f790303 100644
--- a/uppsrc/ide/Browser/CodeBrowser.cpp
+++ b/uppsrc/ide/Browser/CodeBrowser.cpp
@@ -189,7 +189,7 @@ void CodeBrowser::LoadScope()
 		for(int i = 0; i < n.GetCount(); i = file < 0 ? FindNext(n, i) : i + 1) {
 			CppItemInfo m;
 			(CppItem&) m = n[i];
-			if((m.uname.StartsWith(find) || filematch && m.file == file) && set.Find(m.qitem) < 0) {
+			if((find.GetCount() && m.uname.StartsWith(find) || filematch && m.file == file) && set.Find(m.qitem) < 0) {
 				set.Add(m.qitem);
 				int q = inherited.Find(m.qitem);
 				if(q >= 0) {
diff --git a/uppsrc/ide/Browser/init b/uppsrc/ide/Browser/init
index 595606c48..12bb44486 100644
--- a/uppsrc/ide/Browser/init
+++ b/uppsrc/ide/Browser/init
@@ -4,7 +4,7 @@
 #include "ide\Common/init"
 #include "PdfDraw/init"
 #include "RichEdit/init"
-#define BLITZ_INDEX__ F6887F3691048C961C2D3E1070431DCF8
+#define BLITZ_INDEX__ FCB83C9D580625CD4EAD50BEDC296DB64
 #include "TopicI.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/ide/Builders/Builders.upp b/uppsrc/ide/Builders/Builders.upp
index 3cd9ab6b5..c5aa22dc2 100644
--- a/uppsrc/ide/Builders/Builders.upp
+++ b/uppsrc/ide/Builders/Builders.upp
@@ -1,4 +1,4 @@
-description "TheIDE - builders - routines to compile programs";
+description "TheIDE - builders - routines to compile programs\377B";
 
 uses
 	coff\binobj,
diff --git a/uppsrc/ide/Common/Common.upp b/uppsrc/ide/Common/Common.upp
index eda388175..a23391920 100644
--- a/uppsrc/ide/Common/Common.upp
+++ b/uppsrc/ide/Common/Common.upp
@@ -1,3 +1,5 @@
+description "\377B";
+
 uses
 	ide\Core;
 
diff --git a/uppsrc/ide/Core/Core.upp b/uppsrc/ide/Core/Core.upp
index 17cbde86e..b42cc3db4 100644
--- a/uppsrc/ide/Core/Core.upp
+++ b/uppsrc/ide/Core/Core.upp
@@ -1,4 +1,4 @@
-description "TheIDE - common library";
+description "TheIDE - common library\377B";
 
 uses
 	CtrlLib,
diff --git a/uppsrc/ide/Debuggers/Debuggers.upp b/uppsrc/ide/Debuggers/Debuggers.upp
index 82e7a2653..a2c6a1732 100644
--- a/uppsrc/ide/Debuggers/Debuggers.upp
+++ b/uppsrc/ide/Debuggers/Debuggers.upp
@@ -1,4 +1,4 @@
-description "TheIDE - debuggers";
+description "TheIDE - debuggers\377B";
 
 uses
 	ide\Common,
diff --git a/uppsrc/ide/IconDes/IconDes.upp b/uppsrc/ide/IconDes/IconDes.upp
index f371e8fc1..aaa43b174 100644
--- a/uppsrc/ide/IconDes/IconDes.upp
+++ b/uppsrc/ide/IconDes/IconDes.upp
@@ -1,4 +1,4 @@
-description "TheIDE - .iml designer";
+description "TheIDE - .iml designer\377B";
 
 uses
 	IconDes,
diff --git a/uppsrc/ide/LayDes/LayDes.upp b/uppsrc/ide/LayDes/LayDes.upp
index a7b8ead76..7e206af06 100644
--- a/uppsrc/ide/LayDes/LayDes.upp
+++ b/uppsrc/ide/LayDes/LayDes.upp
@@ -1,4 +1,4 @@
-description "TheIDE - .lay designer";
+description "TheIDE - .lay designer\377B";
 
 uses
 	ide\Common,
diff --git a/uppsrc/ide/QuickTabs/QuickTabs.upp b/uppsrc/ide/QuickTabs/QuickTabs.upp
index 016256908..cc714ab09 100644
--- a/uppsrc/ide/QuickTabs/QuickTabs.upp
+++ b/uppsrc/ide/QuickTabs/QuickTabs.upp
@@ -1,3 +1,5 @@
+description "\377B";
+
 uses
 	CtrlLib;