diff --git a/code/custom/languages/tree_sitter_cpp.h b/code/custom/languages/tree_sitter_cpp.h
index 49184546..d7692fec 100644
--- a/code/custom/languages/tree_sitter_cpp.h
+++ b/code/custom/languages/tree_sitter_cpp.h
@@ -3,8 +3,6 @@
 #ifndef TREE_SITTER_CPP_H
 #define TREE_SITTER_CPP_H
 
-String_Const_u8 TS_CPP_NEST_QUERY = string_u8_litexpr("(_ \"{\" @scope_begin \"}\" @scope_end )\n");
-
 // Source: https://github.com/tree-sitter/tree-sitter-cpp/blob/master/queries/tags.scm
 String_Const_u8 TS_CPP_TAGS_QUERY_SCM = string_u8_litexpr(R"DONE(
 (struct_specifier name: (type_identifier) @name body:(_)) @definition.class
@@ -22,6 +20,11 @@ String_Const_u8 TS_CPP_TAGS_QUERY_SCM = string_u8_litexpr(R"DONE(
 (enum_specifier name: (type_identifier) @name) @definition.type
 
 (class_specifier name: (type_identifier) @name) @definition.class
+
+(_ "{" @scope_begin "}" @scope_end )
+(_ "(" @scope_begin ")" @scope_end )
+(_ "[" @scope_begin "]" @scope_end )
+
 )DONE");
 
 // Source: https://github.com/tree-sitter/tree-sitter-cpp/blob/master/queries/highlights.scm
@@ -198,7 +201,6 @@ tree_sitter_register_cpp(Application_Links* app)
   Tree_Sitter_Language_Queries queries = {};
   queries.ptr[Tree_Sitter_Language_Query_Highlights] = tree_sitter_query_new(app, language, TS_CPP_HIGHLIGHT_QUERY_SCM);
   queries.ptr[Tree_Sitter_Language_Query_Tags]       = tree_sitter_query_new(app, language, TS_CPP_TAGS_QUERY_SCM);
-  queries.ptr[Tree_Sitter_Language_Query_Nests]      = tree_sitter_query_new(app, language, TS_CPP_NEST_QUERY);
   tree_sitter_register_language(SCu8("c"),   language, queries);
   tree_sitter_register_language(SCu8("cpp"), language, queries);
   tree_sitter_register_language(SCu8("h"),   language, queries);