diff --git a/README.md b/README.md
index c1f23e4..9a7aa31 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ together with other plugins.
 
 ### Tree-sitter integration
 
-_Note: Currently this feature is possible in neovim 0.5.5+ only._
+_Note: Currently this feature is possible in neovim 0.5+ only._
 
 match-up now has experimental support for language syntax provided
 by tree-sitter.  The list of supported languages is available
diff --git a/after/queries/cpp/matchup.scm b/after/queries/cpp/matchup.scm
index a5a5208..3834fe3 100644
--- a/after/queries/cpp/matchup.scm
+++ b/after/queries/cpp/matchup.scm
@@ -1 +1,5 @@
 ; inherits: c
+
+(template_parameter_list
+  "<" @open.template
+  ">" @close.template) @scope.template
diff --git a/after/queries/lua/matchup.scm b/after/queries/lua/matchup.scm
index f4b618b..dcdfae9 100644
--- a/after/queries/lua/matchup.scm
+++ b/after/queries/lua/matchup.scm
@@ -12,14 +12,17 @@
   "if" @open.if
   "end" @close.if) @scope.if
 (else "else" @mid.if.1)
+(elseif "elseif" @mid.if.2)
 
 (function
   "function" @open.function
   "end" @close.function) @scope.function
-
 (local_function
   "function" @open.function
   "end" @close.function) @scope.function
+(function_definition
+  "function" @open.function
+  "end" @close.function) @scope.function
 
 (return_statement
   "return" @mid.function.1)