diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedFormatStringQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedFormatStringQuery.qll
index 0475999ed3c..b10088af82e 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedFormatStringQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedFormatStringQuery.qll
@@ -13,7 +13,23 @@ private import TaintedFormatStringCustomizations::TaintedFormatString
 /**
  * A taint-tracking configuration for format injections.
  */
-class Configuration extends TaintTracking::Configuration {
+module TaintedFormatStringConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof Source }
+
+  predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node node) { node instanceof Sanitizer }
+}
+
+/**
+ * Taint-tracking for format injections.
+ */
+module TaintedFormatStringFlow = TaintTracking::Global<TaintedFormatStringConfig>;
+
+/**
+ * DEPRECATED. Use the `TaintedFormatStringFlow` module instead.
+ */
+deprecated class Configuration extends TaintTracking::Configuration {
   Configuration() { this = "TaintedFormatString" }
 
   override predicate isSource(DataFlow::Node source) { source instanceof Source }
diff --git a/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql b/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql
index 0a595e7e05f..1f315244cbe 100644
--- a/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql
+++ b/javascript/ql/src/Security/CWE-134/TaintedFormatString.ql
@@ -12,9 +12,9 @@
 
 import javascript
 import semmle.javascript.security.dataflow.TaintedFormatStringQuery
-import DataFlow::PathGraph
+import TaintedFormatStringFlow::PathGraph
 
-from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink
-where cfg.hasFlowPath(source, sink)
+from TaintedFormatStringFlow::PathNode source, TaintedFormatStringFlow::PathNode sink
+where TaintedFormatStringFlow::flowPath(source, sink)
 select sink.getNode(), source, sink, "Format string depends on a $@.", source.getNode(),
   "user-provided value"
diff --git a/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.expected b/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.expected
index 856b4edf80a..8a3688cad56 100644
--- a/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-134/TaintedFormatString.expected
@@ -1,85 +1,26 @@
-nodes
-| tst.js:5:15:5:30 | req.query.format |
-| tst.js:5:15:5:30 | req.query.format |
-| tst.js:5:15:5:30 | req.query.format |
-| tst.js:6:26:6:41 | req.query.format |
-| tst.js:6:26:6:41 | req.query.format |
-| tst.js:6:26:6:41 | req.query.format |
-| tst.js:7:15:7:30 | req.query.format |
-| tst.js:7:15:7:30 | req.query.format |
-| tst.js:7:15:7:30 | req.query.format |
-| tst.js:8:17:8:32 | req.query.format |
-| tst.js:8:17:8:32 | req.query.format |
-| tst.js:8:17:8:32 | req.query.format |
-| tst.js:9:16:9:31 | req.query.format |
-| tst.js:9:16:9:31 | req.query.format |
-| tst.js:9:16:9:31 | req.query.format |
-| tst.js:10:12:10:27 | req.query.format |
-| tst.js:10:12:10:27 | req.query.format |
-| tst.js:10:12:10:27 | req.query.format |
-| tst.js:11:32:11:47 | req.query.format |
-| tst.js:11:32:11:47 | req.query.format |
-| tst.js:11:32:11:47 | req.query.format |
-| tst.js:12:21:12:36 | req.query.format |
-| tst.js:12:21:12:36 | req.query.format |
-| tst.js:12:21:12:36 | req.query.format |
-| tst.js:13:35:13:50 | req.query.format |
-| tst.js:13:35:13:50 | req.query.format |
-| tst.js:13:35:13:50 | req.query.format |
-| tst.js:14:29:14:44 | req.query.format |
-| tst.js:14:29:14:44 | req.query.format |
-| tst.js:14:29:14:44 | req.query.format |
-| tst.js:15:30:15:45 | req.query.format |
-| tst.js:15:30:15:45 | req.query.format |
-| tst.js:15:30:15:45 | req.query.format |
-| tst.js:16:26:16:41 | req.query.format |
-| tst.js:16:26:16:41 | req.query.format |
-| tst.js:16:26:16:41 | req.query.format |
-| tst.js:17:30:17:45 | req.query.format |
-| tst.js:17:30:17:45 | req.query.format |
-| tst.js:17:30:17:45 | req.query.format |
-| tst.js:18:38:18:53 | req.query.format |
-| tst.js:18:38:18:53 | req.query.format |
-| tst.js:18:38:18:53 | req.query.format |
-| tst.js:20:17:20:32 | req.query.format |
-| tst.js:20:17:20:32 | req.query.format |
-| tst.js:20:17:20:32 | req.query.format |
-| tst.js:21:16:21:31 | req.query.format |
-| tst.js:21:16:21:31 | req.query.format |
-| tst.js:21:16:21:31 | req.query.format |
-| tst.js:22:17:22:32 | req.query.format |
-| tst.js:22:17:22:32 | req.query.format |
-| tst.js:22:17:22:32 | req.query.format |
-| tst.js:24:25:24:40 | req.query.format |
-| tst.js:24:25:24:40 | req.query.format |
-| tst.js:24:25:24:40 | req.query.format |
-| tst.js:25:33:25:48 | req.query.format |
-| tst.js:25:33:25:48 | req.query.format |
-| tst.js:25:33:25:48 | req.query.format |
-| tst.js:26:34:26:49 | req.query.format |
-| tst.js:26:34:26:49 | req.query.format |
-| tst.js:26:34:26:49 | req.query.format |
 edges
-| tst.js:5:15:5:30 | req.query.format | tst.js:5:15:5:30 | req.query.format |
-| tst.js:6:26:6:41 | req.query.format | tst.js:6:26:6:41 | req.query.format |
-| tst.js:7:15:7:30 | req.query.format | tst.js:7:15:7:30 | req.query.format |
-| tst.js:8:17:8:32 | req.query.format | tst.js:8:17:8:32 | req.query.format |
-| tst.js:9:16:9:31 | req.query.format | tst.js:9:16:9:31 | req.query.format |
-| tst.js:10:12:10:27 | req.query.format | tst.js:10:12:10:27 | req.query.format |
-| tst.js:11:32:11:47 | req.query.format | tst.js:11:32:11:47 | req.query.format |
-| tst.js:12:21:12:36 | req.query.format | tst.js:12:21:12:36 | req.query.format |
-| tst.js:13:35:13:50 | req.query.format | tst.js:13:35:13:50 | req.query.format |
-| tst.js:14:29:14:44 | req.query.format | tst.js:14:29:14:44 | req.query.format |
-| tst.js:15:30:15:45 | req.query.format | tst.js:15:30:15:45 | req.query.format |
-| tst.js:16:26:16:41 | req.query.format | tst.js:16:26:16:41 | req.query.format |
-| tst.js:17:30:17:45 | req.query.format | tst.js:17:30:17:45 | req.query.format |
-| tst.js:18:38:18:53 | req.query.format | tst.js:18:38:18:53 | req.query.format |
-| tst.js:20:17:20:32 | req.query.format | tst.js:20:17:20:32 | req.query.format |
-| tst.js:21:16:21:31 | req.query.format | tst.js:21:16:21:31 | req.query.format |
-| tst.js:22:17:22:32 | req.query.format | tst.js:22:17:22:32 | req.query.format |
-| tst.js:24:25:24:40 | req.query.format | tst.js:24:25:24:40 | req.query.format |
-| tst.js:25:33:25:48 | req.query.format | tst.js:25:33:25:48 | req.query.format |
-| tst.js:26:34:26:49 | req.query.format | tst.js:26:34:26:49 | req.query.format |
+nodes
+| tst.js:5:15:5:30 | req.query.format | semmle.label | req.query.format |
+| tst.js:6:26:6:41 | req.query.format | semmle.label | req.query.format |
+| tst.js:7:15:7:30 | req.query.format | semmle.label | req.query.format |
+| tst.js:8:17:8:32 | req.query.format | semmle.label | req.query.format |
+| tst.js:9:16:9:31 | req.query.format | semmle.label | req.query.format |
+| tst.js:10:12:10:27 | req.query.format | semmle.label | req.query.format |
+| tst.js:11:32:11:47 | req.query.format | semmle.label | req.query.format |
+| tst.js:12:21:12:36 | req.query.format | semmle.label | req.query.format |
+| tst.js:13:35:13:50 | req.query.format | semmle.label | req.query.format |
+| tst.js:14:29:14:44 | req.query.format | semmle.label | req.query.format |
+| tst.js:15:30:15:45 | req.query.format | semmle.label | req.query.format |
+| tst.js:16:26:16:41 | req.query.format | semmle.label | req.query.format |
+| tst.js:17:30:17:45 | req.query.format | semmle.label | req.query.format |
+| tst.js:18:38:18:53 | req.query.format | semmle.label | req.query.format |
+| tst.js:20:17:20:32 | req.query.format | semmle.label | req.query.format |
+| tst.js:21:16:21:31 | req.query.format | semmle.label | req.query.format |
+| tst.js:22:17:22:32 | req.query.format | semmle.label | req.query.format |
+| tst.js:24:25:24:40 | req.query.format | semmle.label | req.query.format |
+| tst.js:25:33:25:48 | req.query.format | semmle.label | req.query.format |
+| tst.js:26:34:26:49 | req.query.format | semmle.label | req.query.format |
+subpaths
 #select
 | tst.js:5:15:5:30 | req.query.format | tst.js:5:15:5:30 | req.query.format | tst.js:5:15:5:30 | req.query.format | Format string depends on a $@. | tst.js:5:15:5:30 | req.query.format | user-provided value |
 | tst.js:6:26:6:41 | req.query.format | tst.js:6:26:6:41 | req.query.format | tst.js:6:26:6:41 | req.query.format | Format string depends on a $@. | tst.js:6:26:6:41 | req.query.format | user-provided value |