diff --git a/queries/haskell/context.scm b/queries/haskell/context.scm
index edc0f645..c07d628f 100644
--- a/queries/haskell/context.scm
+++ b/queries/haskell/context.scm
@@ -1,5 +1,12 @@
+(haskell (header
+  module: (module) @context)) @context.end
+
 ([
-  (alt)
-  (exp_case)
+  (alternative)
+  (expression/case)
+  (signature)
+  (bind)
   (function)
+  (class)
+  (data_type)
 ] @context)