diff --git a/python/ql/src/semmle/python/security/strings/External.qll b/python/ql/src/semmle/python/security/strings/External.qll
index 701e5c5017af..009ece2ff9f9 100644
--- a/python/ql/src/semmle/python/security/strings/External.qll
+++ b/python/ql/src/semmle/python/security/strings/External.qll
@@ -22,6 +22,10 @@ abstract class ExternalStringKind extends StringKind {
         urlsplit(fromnode, tonode) and result.(ExternalUrlSplitResult).getItem() = this
         or
         urlparse(fromnode, tonode) and result.(ExternalUrlParseResult).getItem() = this
+        or
+        parse_qs(fromnode, tonode) and result.(ExternalStringDictKind).getValue() = this
+        or
+        parse_qsl(fromnode, tonode) and result.(SequenceKind).getItem().(SequenceKind).getItem() = this
     }
 }
 
@@ -181,6 +185,58 @@ private predicate urlparse(ControlFlowNode fromnode, CallNode tonode) {
     )
 }
 
+private predicate parse_qs(ControlFlowNode fromnode, CallNode tonode) {
+    // This could be implemented as `exists(FunctionValue` without the explicit six part,
+    // but then our tests will need to import +100 modules, so for now this slightly
+    // altered version gets to live on.
+    exists(Value parse_qs |
+        (
+            parse_qs = Value::named("six.moves.urllib.parse.parse_qs")
+            or
+            // Python 2
+            parse_qs = Value::named("urlparse.parse_qs")
+            or
+            // Python 2 deprecated version of `urlparse.parse_qs`
+            parse_qs = Value::named("cgi.parse_qs")
+            or
+            // Python 3
+            parse_qs = Value::named("urllib.parse.parse_qs")
+        ) and
+        tonode = parse_qs.getACall() and
+        (
+            tonode.getArg(0) = fromnode
+            or
+            tonode.getArgByName("qs") = fromnode
+        )
+    )
+}
+
+private predicate parse_qsl(ControlFlowNode fromnode, CallNode tonode) {
+    // This could be implemented as `exists(FunctionValue` without the explicit six part,
+    // but then our tests will need to import +100 modules, so for now this slightly
+    // altered version gets to live on.
+    exists(Value parse_qsl |
+        (
+            parse_qsl = Value::named("six.moves.urllib.parse.parse_qsl")
+            or
+            // Python 2
+            parse_qsl = Value::named("urlparse.parse_qsl")
+            or
+            // Python 2 deprecated version of `urlparse.parse_qsl`
+            parse_qsl = Value::named("cgi.parse_qsl")
+            or
+            // Python 3
+            parse_qsl = Value::named("urllib.parse.parse_qsl")
+        ) and
+        tonode = parse_qsl.getACall() and
+        (
+            tonode.getArg(0) = fromnode
+            or
+            tonode.getArgByName("qs") = fromnode
+        )
+    )
+}
+
 /** A kind of "taint", representing an open file-like object from an external source. */
 class ExternalFileObject extends TaintKind {
     ExternalStringKind valueKind;
diff --git a/python/ql/test/library-tests/taint/strings/TestStep.expected b/python/ql/test/library-tests/taint/strings/TestStep.expected
index ad1f6f73d6c1..4dc6682ee81c 100644
--- a/python/ql/test/library-tests/taint/strings/TestStep.expected
+++ b/python/ql/test/library-tests/taint/strings/TestStep.expected
@@ -1,156 +1,162 @@
-| Taint [externally controlled string] | test.py:67 | test.py:67:20:67:43 | urlsplit() |  |  -->  | Taint [externally controlled string] | test.py:69 | test.py:69:10:69:21 | urlsplit_res |  |
-| Taint [externally controlled string] | test.py:68 | test.py:68:20:68:43 | urlparse() |  |  -->  | Taint [externally controlled string] | test.py:69 | test.py:69:24:69:35 | urlparse_res |  |
-| Taint [externally controlled string] | test.py:98 | test.py:98:9:98:37 | Attribute() |  |  -->  | Taint externally controlled string | test.py:98 | test.py:98:9:98:40 | Subscript |  |
-| Taint [externally controlled string] | test.py:102 | test.py:102:9:102:38 | Attribute() |  |  -->  | Taint externally controlled string | test.py:102 | test.py:102:9:102:41 | Subscript |  |
-| Taint [externally controlled string] | test.py:104 | test.py:104:9:104:37 | Attribute() |  |  -->  | Taint externally controlled string | test.py:104 | test.py:104:9:104:41 | Subscript |  |
-| Taint [externally controlled string] | test.py:107 | test.py:107:9:107:30 | Attribute() |  |  -->  | Taint externally controlled string | test.py:107 | test.py:107:9:107:33 | Subscript |  |
-| Taint [externally controlled string] | test.py:109 | test.py:109:9:109:35 | Attribute() |  |  -->  | Taint externally controlled string | test.py:109 | test.py:109:9:109:38 | Subscript |  |
-| Taint exception.info | test.py:44 | test.py:44:22:44:26 | taint | p1 = exception.info |  -->  | Taint exception.info | test.py:45 | test.py:45:17:45:21 | taint | p1 = exception.info |
-| Taint exception.info | test.py:45 | test.py:45:17:45:21 | taint | p1 = exception.info |  -->  | Taint exception.info | test.py:45 | test.py:45:12:45:22 | func() | p1 = exception.info |
-| Taint exception.info | test.py:45 | test.py:45:17:45:21 | taint | p1 = exception.info |  -->  | Taint exception.info | test.py:52 | test.py:52:19:52:21 | arg | p0 = exception.info |
-| Taint exception.info | test.py:48 | test.py:48:12:48:33 | TAINTED_EXCEPTION_INFO |  |  -->  | Taint exception.info | test.py:49 | test.py:49:37:49:40 | info |  |
-| Taint exception.info | test.py:49 | test.py:49:11:49:41 | cross_over() |  |  -->  | Taint exception.info | test.py:50 | test.py:50:10:50:12 | res |  |
-| Taint exception.info | test.py:49 | test.py:49:37:49:40 | info |  |  -->  | Taint exception.info | test.py:44 | test.py:44:22:44:26 | taint | p1 = exception.info |
-| Taint exception.info | test.py:49 | test.py:49:37:49:40 | info |  |  -->  | Taint exception.info | test.py:49 | test.py:49:11:49:41 | cross_over() |  |
-| Taint exception.info | test.py:52 | test.py:52:19:52:21 | arg | p0 = exception.info |  -->  | Taint exception.info | test.py:53 | test.py:53:12:53:14 | arg | p0 = exception.info |
-| Taint externally controlled string | test.py:5 | test.py:5:22:5:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:6 | test.py:6:31:6:44 | tainted_string |  |
-| Taint externally controlled string | test.py:6 | test.py:6:31:6:44 | tainted_string |  |  -->  | Taint json[externally controlled string] | test.py:6 | test.py:6:20:6:45 | Attribute() |  |
-| Taint externally controlled string | test.py:7 | test.py:7:9:7:25 | Subscript |  |  -->  | Taint externally controlled string | test.py:8 | test.py:8:9:8:9 | a |  |
-| Taint externally controlled string | test.py:7 | test.py:7:9:7:25 | Subscript |  |  -->  | Taint externally controlled string | test.py:10 | test.py:10:10:10:10 | a |  |
-| Taint externally controlled string | test.py:8 | test.py:8:9:8:18 | Attribute() |  |  -->  | Taint externally controlled string | test.py:9 | test.py:9:9:9:9 | b |  |
-| Taint externally controlled string | test.py:8 | test.py:8:9:8:18 | Attribute() |  |  -->  | Taint externally controlled string | test.py:10 | test.py:10:13:10:13 | b |  |
-| Taint externally controlled string | test.py:9 | test.py:9:9:9:14 | Subscript |  |  -->  | Taint externally controlled string | test.py:10 | test.py:10:16:10:16 | c |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:14 | test.py:14:9:14:22 | tainted_string |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:15 | test.py:15:9:15:22 | tainted_string |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:16 | test.py:16:9:16:22 | tainted_string |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:17 | test.py:17:9:17:22 | tainted_string |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:18 | test.py:18:18:18:31 | tainted_string |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:19 | test.py:19:14:19:27 | tainted_string |  |
-| Taint externally controlled string | test.py:13 | test.py:13:22:13:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:20 | test.py:20:9:20:22 | tainted_string |  |
-| Taint externally controlled string | test.py:14 | test.py:14:9:14:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:14 | test.py:14:9:14:31 | Attribute() |  |
-| Taint externally controlled string | test.py:14 | test.py:14:9:14:31 | Attribute() |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:10:21:10 | a |  |
-| Taint externally controlled string | test.py:15 | test.py:15:9:15:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:15 | test.py:15:9:15:29 | Attribute() |  |
-| Taint externally controlled string | test.py:15 | test.py:15:9:15:29 | Attribute() |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:13:21:13 | b |  |
-| Taint externally controlled string | test.py:16 | test.py:16:9:16:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:16 | test.py:16:9:16:25 | Subscript |  |
-| Taint externally controlled string | test.py:16 | test.py:16:9:16:25 | Subscript |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:16:21:16 | c |  |
-| Taint externally controlled string | test.py:17 | test.py:17:9:17:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:17 | test.py:17:9:17:27 | Subscript |  |
-| Taint externally controlled string | test.py:17 | test.py:17:9:17:27 | Subscript |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:19:21:19 | d |  |
-| Taint externally controlled string | test.py:18 | test.py:18:9:18:32 | reversed() |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:22:21:22 | e |  |
-| Taint externally controlled string | test.py:18 | test.py:18:18:18:31 | tainted_string |  |  -->  | Taint externally controlled string | test.py:18 | test.py:18:9:18:32 | reversed() |  |
-| Taint externally controlled string | test.py:19 | test.py:19:9:19:28 | copy() |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:25:21:25 | f |  |
-| Taint externally controlled string | test.py:19 | test.py:19:14:19:27 | tainted_string |  |  -->  | Taint externally controlled string | test.py:19 | test.py:19:9:19:28 | copy() |  |
-| Taint externally controlled string | test.py:20 | test.py:20:9:20:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:20 | test.py:20:9:20:30 | Attribute() |  |
-| Taint externally controlled string | test.py:20 | test.py:20:9:20:30 | Attribute() |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:28:21:28 | g |  |
-| Taint externally controlled string | test.py:24 | test.py:24:22:24:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:25 | test.py:25:8:25:21 | tainted_string |  |
-| Taint externally controlled string | test.py:24 | test.py:24:22:24:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:28 | test.py:28:14:28:27 | tainted_string |  |
-| Taint externally controlled string | test.py:31 | test.py:31:22:31:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:32 | test.py:32:8:32:21 | tainted_string |  |
-| Taint externally controlled string | test.py:31 | test.py:31:22:31:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:32 | test.py:32:34:32:47 | tainted_string |  |
-| Taint externally controlled string | test.py:31 | test.py:31:22:31:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:35 | test.py:35:14:35:27 | tainted_string |  |
-| Taint externally controlled string | test.py:38 | test.py:38:22:38:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:39 | test.py:39:13:39:26 | tainted_string |  |
-| Taint externally controlled string | test.py:38 | test.py:38:22:38:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:40 | test.py:40:15:40:28 | tainted_string |  |
-| Taint externally controlled string | test.py:38 | test.py:38:22:38:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:41 | test.py:41:15:41:28 | tainted_string |  |
-| Taint externally controlled string | test.py:39 | test.py:39:9:39:27 | str() |  |  -->  | Taint externally controlled string | test.py:42 | test.py:42:10:42:10 | a |  |
-| Taint externally controlled string | test.py:39 | test.py:39:13:39:26 | tainted_string |  |  -->  | Taint externally controlled string | test.py:39 | test.py:39:9:39:27 | str() |  |
-| Taint externally controlled string | test.py:40 | test.py:40:9:40:29 | bytes() |  |  -->  | Taint externally controlled string | test.py:42 | test.py:42:13:42:13 | b |  |
-| Taint externally controlled string | test.py:40 | test.py:40:15:40:28 | tainted_string |  |  -->  | Taint externally controlled string | test.py:40 | test.py:40:9:40:29 | bytes() |  |
-| Taint externally controlled string | test.py:41 | test.py:41:9:41:46 | bytes() |  |  -->  | Taint externally controlled string | test.py:42 | test.py:42:16:42:16 | c |  |
-| Taint externally controlled string | test.py:41 | test.py:41:15:41:28 | tainted_string |  |  -->  | Taint externally controlled string | test.py:41 | test.py:41:9:41:46 | bytes() |  |
-| Taint externally controlled string | test.py:44 | test.py:44:22:44:26 | taint | p1 = externally controlled string |  -->  | Taint externally controlled string | test.py:45 | test.py:45:17:45:21 | taint | p1 = externally controlled string |
-| Taint externally controlled string | test.py:45 | test.py:45:17:45:21 | taint | p1 = externally controlled string |  -->  | Taint externally controlled string | test.py:45 | test.py:45:12:45:22 | func() | p1 = externally controlled string |
-| Taint externally controlled string | test.py:45 | test.py:45:17:45:21 | taint | p1 = externally controlled string |  -->  | Taint externally controlled string | test.py:52 | test.py:52:19:52:21 | arg | p0 = externally controlled string |
-| Taint externally controlled string | test.py:52 | test.py:52:19:52:21 | arg | p0 = externally controlled string |  -->  | Taint externally controlled string | test.py:53 | test.py:53:12:53:14 | arg | p0 = externally controlled string |
-| Taint externally controlled string | test.py:56 | test.py:56:11:56:24 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:57 | test.py:57:38:57:40 | ext |  |
-| Taint externally controlled string | test.py:57 | test.py:57:11:57:41 | cross_over() |  |  -->  | Taint externally controlled string | test.py:58 | test.py:58:10:58:12 | res |  |
-| Taint externally controlled string | test.py:57 | test.py:57:38:57:40 | ext |  |  -->  | Taint externally controlled string | test.py:44 | test.py:44:22:44:26 | taint | p1 = externally controlled string |
-| Taint externally controlled string | test.py:57 | test.py:57:38:57:40 | ext |  |  -->  | Taint externally controlled string | test.py:57 | test.py:57:11:57:41 | cross_over() |  |
-| Taint externally controlled string | test.py:66 | test.py:66:22:66:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:67 | test.py:67:29:67:42 | tainted_string |  |
-| Taint externally controlled string | test.py:66 | test.py:66:22:66:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:68 | test.py:68:29:68:42 | tainted_string |  |
-| Taint externally controlled string | test.py:67 | test.py:67:29:67:42 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:67 | test.py:67:20:67:43 | urlsplit() |  |
-| Taint externally controlled string | test.py:68 | test.py:68:29:68:42 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:68 | test.py:68:20:68:43 | urlparse() |  |
-| Taint externally controlled string | test.py:72 | test.py:72:22:72:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:74 | test.py:74:9:74:22 | tainted_string |  |
-| Taint externally controlled string | test.py:72 | test.py:72:22:72:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:76 | test.py:76:12:76:25 | tainted_string |  |
-| Taint externally controlled string | test.py:74 | test.py:74:9:74:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:74 | test.py:74:9:74:30 | Attribute() |  |
-| Taint externally controlled string | test.py:74 | test.py:74:9:74:30 | Attribute() |  |  -->  | Taint externally controlled string | test.py:79 | test.py:79:10:79:10 | a |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:85 | test.py:85:9:85:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:86 | test.py:86:9:86:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:87 | test.py:87:9:87:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:88 | test.py:88:9:88:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:89 | test.py:89:9:89:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:90 | test.py:90:9:90:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:91 | test.py:91:9:91:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:92 | test.py:92:9:92:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:93 | test.py:93:9:93:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:94 | test.py:94:9:94:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:95 | test.py:95:9:95:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:96 | test.py:96:9:96:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:97 | test.py:97:9:97:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:98 | test.py:98:9:98:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:99 | test.py:99:9:99:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:100 | test.py:100:9:100:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:101 | test.py:101:9:101:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:102 | test.py:102:9:102:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:103 | test.py:103:9:103:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:104 | test.py:104:9:104:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:105 | test.py:105:9:105:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:106 | test.py:106:9:106:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:107 | test.py:107:9:107:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:108 | test.py:108:9:108:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:109 | test.py:109:9:109:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:110 | test.py:110:9:110:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:111 | test.py:111:9:111:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:112 | test.py:112:9:112:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:115 | test.py:115:9:115:22 | tainted_string |  |
-| Taint externally controlled string | test.py:82 | test.py:82:22:82:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:116 | test.py:116:9:116:22 | tainted_string |  |
-| Taint externally controlled string | test.py:85 | test.py:85:9:85:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:85 | test.py:85:9:85:35 | Attribute() |  |
-| Taint externally controlled string | test.py:86 | test.py:86:9:86:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:86 | test.py:86:9:86:33 | Attribute() |  |
-| Taint externally controlled string | test.py:87 | test.py:87:9:87:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:87 | test.py:87:9:87:31 | Attribute() |  |
-| Taint externally controlled string | test.py:88 | test.py:88:9:88:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:88 | test.py:88:9:88:38 | Attribute() |  |
-| Taint externally controlled string | test.py:89 | test.py:89:9:89:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:89 | test.py:89:9:89:38 | Attribute() |  |
-| Taint externally controlled string | test.py:89 | test.py:89:9:89:38 | Attribute() |  |  -->  | Taint externally controlled string | test.py:89 | test.py:89:9:89:54 | Attribute() |  |
-| Taint externally controlled string | test.py:90 | test.py:90:9:90:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:90 | test.py:90:9:90:35 | Attribute() |  |
-| Taint externally controlled string | test.py:91 | test.py:91:9:91:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:91 | test.py:91:9:91:37 | Attribute() |  |
-| Taint externally controlled string | test.py:92 | test.py:92:9:92:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:92 | test.py:92:9:92:46 | Attribute() |  |
-| Taint externally controlled string | test.py:93 | test.py:93:9:93:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:93 | test.py:93:9:93:33 | Attribute() |  |
-| Taint externally controlled string | test.py:94 | test.py:94:9:94:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:94 | test.py:94:9:94:30 | Attribute() |  |
-| Taint externally controlled string | test.py:95 | test.py:95:9:95:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:95 | test.py:95:9:95:31 | Attribute() |  |
+| Taint [[externally controlled string]] | test.py:74 | test.py:74:9:74:33 | parse_qsl() |  |  -->  | Taint [[externally controlled string]] | test.py:75 | test.py:75:19:75:19 | d |  |
+| Taint [externally controlled string] | test.py:71 | test.py:71:9:71:32 | urlsplit() |  |  -->  | Taint [externally controlled string] | test.py:75 | test.py:75:10:75:10 | a |  |
+| Taint [externally controlled string] | test.py:72 | test.py:72:9:72:32 | urlparse() |  |  -->  | Taint [externally controlled string] | test.py:75 | test.py:75:13:75:13 | b |  |
+| Taint [externally controlled string] | test.py:104 | test.py:104:9:104:37 | Attribute() |  |  -->  | Taint externally controlled string | test.py:104 | test.py:104:9:104:40 | Subscript |  |
+| Taint [externally controlled string] | test.py:108 | test.py:108:9:108:38 | Attribute() |  |  -->  | Taint externally controlled string | test.py:108 | test.py:108:9:108:41 | Subscript |  |
+| Taint [externally controlled string] | test.py:110 | test.py:110:9:110:37 | Attribute() |  |  -->  | Taint externally controlled string | test.py:110 | test.py:110:9:110:41 | Subscript |  |
+| Taint [externally controlled string] | test.py:113 | test.py:113:9:113:30 | Attribute() |  |  -->  | Taint externally controlled string | test.py:113 | test.py:113:9:113:33 | Subscript |  |
+| Taint [externally controlled string] | test.py:115 | test.py:115:9:115:35 | Attribute() |  |  -->  | Taint externally controlled string | test.py:115 | test.py:115:9:115:38 | Subscript |  |
+| Taint exception.info | test.py:45 | test.py:45:22:45:26 | taint | p1 = exception.info |  -->  | Taint exception.info | test.py:46 | test.py:46:17:46:21 | taint | p1 = exception.info |
+| Taint exception.info | test.py:46 | test.py:46:17:46:21 | taint | p1 = exception.info |  -->  | Taint exception.info | test.py:46 | test.py:46:12:46:22 | func() | p1 = exception.info |
+| Taint exception.info | test.py:46 | test.py:46:17:46:21 | taint | p1 = exception.info |  -->  | Taint exception.info | test.py:53 | test.py:53:19:53:21 | arg | p0 = exception.info |
+| Taint exception.info | test.py:49 | test.py:49:12:49:33 | TAINTED_EXCEPTION_INFO |  |  -->  | Taint exception.info | test.py:50 | test.py:50:37:50:40 | info |  |
+| Taint exception.info | test.py:50 | test.py:50:11:50:41 | cross_over() |  |  -->  | Taint exception.info | test.py:51 | test.py:51:10:51:12 | res |  |
+| Taint exception.info | test.py:50 | test.py:50:37:50:40 | info |  |  -->  | Taint exception.info | test.py:45 | test.py:45:22:45:26 | taint | p1 = exception.info |
+| Taint exception.info | test.py:50 | test.py:50:37:50:40 | info |  |  -->  | Taint exception.info | test.py:50 | test.py:50:11:50:41 | cross_over() |  |
+| Taint exception.info | test.py:53 | test.py:53:19:53:21 | arg | p0 = exception.info |  -->  | Taint exception.info | test.py:54 | test.py:54:12:54:14 | arg | p0 = exception.info |
+| Taint externally controlled string | test.py:6 | test.py:6:22:6:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:7 | test.py:7:31:7:44 | tainted_string |  |
+| Taint externally controlled string | test.py:7 | test.py:7:31:7:44 | tainted_string |  |  -->  | Taint json[externally controlled string] | test.py:7 | test.py:7:20:7:45 | Attribute() |  |
+| Taint externally controlled string | test.py:8 | test.py:8:9:8:25 | Subscript |  |  -->  | Taint externally controlled string | test.py:9 | test.py:9:9:9:9 | a |  |
+| Taint externally controlled string | test.py:8 | test.py:8:9:8:25 | Subscript |  |  -->  | Taint externally controlled string | test.py:11 | test.py:11:10:11:10 | a |  |
+| Taint externally controlled string | test.py:9 | test.py:9:9:9:18 | Attribute() |  |  -->  | Taint externally controlled string | test.py:10 | test.py:10:9:10:9 | b |  |
+| Taint externally controlled string | test.py:9 | test.py:9:9:9:18 | Attribute() |  |  -->  | Taint externally controlled string | test.py:11 | test.py:11:13:11:13 | b |  |
+| Taint externally controlled string | test.py:10 | test.py:10:9:10:14 | Subscript |  |  -->  | Taint externally controlled string | test.py:11 | test.py:11:16:11:16 | c |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:15 | test.py:15:9:15:22 | tainted_string |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:16 | test.py:16:9:16:22 | tainted_string |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:17 | test.py:17:9:17:22 | tainted_string |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:18 | test.py:18:9:18:22 | tainted_string |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:19 | test.py:19:18:19:31 | tainted_string |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:20 | test.py:20:14:20:27 | tainted_string |  |
+| Taint externally controlled string | test.py:14 | test.py:14:22:14:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:9:21:22 | tainted_string |  |
+| Taint externally controlled string | test.py:15 | test.py:15:9:15:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:15 | test.py:15:9:15:31 | Attribute() |  |
+| Taint externally controlled string | test.py:15 | test.py:15:9:15:31 | Attribute() |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:10:22:10 | a |  |
+| Taint externally controlled string | test.py:16 | test.py:16:9:16:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:16 | test.py:16:9:16:29 | Attribute() |  |
+| Taint externally controlled string | test.py:16 | test.py:16:9:16:29 | Attribute() |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:13:22:13 | b |  |
+| Taint externally controlled string | test.py:17 | test.py:17:9:17:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:17 | test.py:17:9:17:25 | Subscript |  |
+| Taint externally controlled string | test.py:17 | test.py:17:9:17:25 | Subscript |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:16:22:16 | c |  |
+| Taint externally controlled string | test.py:18 | test.py:18:9:18:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:18 | test.py:18:9:18:27 | Subscript |  |
+| Taint externally controlled string | test.py:18 | test.py:18:9:18:27 | Subscript |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:19:22:19 | d |  |
+| Taint externally controlled string | test.py:19 | test.py:19:9:19:32 | reversed() |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:22:22:22 | e |  |
+| Taint externally controlled string | test.py:19 | test.py:19:18:19:31 | tainted_string |  |  -->  | Taint externally controlled string | test.py:19 | test.py:19:9:19:32 | reversed() |  |
+| Taint externally controlled string | test.py:20 | test.py:20:9:20:28 | copy() |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:25:22:25 | f |  |
+| Taint externally controlled string | test.py:20 | test.py:20:14:20:27 | tainted_string |  |  -->  | Taint externally controlled string | test.py:20 | test.py:20:9:20:28 | copy() |  |
+| Taint externally controlled string | test.py:21 | test.py:21:9:21:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:21 | test.py:21:9:21:30 | Attribute() |  |
+| Taint externally controlled string | test.py:21 | test.py:21:9:21:30 | Attribute() |  |  -->  | Taint externally controlled string | test.py:22 | test.py:22:28:22:28 | g |  |
+| Taint externally controlled string | test.py:25 | test.py:25:22:25:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:26 | test.py:26:8:26:21 | tainted_string |  |
+| Taint externally controlled string | test.py:25 | test.py:25:22:25:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:29 | test.py:29:14:29:27 | tainted_string |  |
+| Taint externally controlled string | test.py:32 | test.py:32:22:32:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:33 | test.py:33:8:33:21 | tainted_string |  |
+| Taint externally controlled string | test.py:32 | test.py:32:22:32:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:33 | test.py:33:34:33:47 | tainted_string |  |
+| Taint externally controlled string | test.py:32 | test.py:32:22:32:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:36 | test.py:36:14:36:27 | tainted_string |  |
+| Taint externally controlled string | test.py:39 | test.py:39:22:39:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:40 | test.py:40:13:40:26 | tainted_string |  |
+| Taint externally controlled string | test.py:39 | test.py:39:22:39:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:41 | test.py:41:15:41:28 | tainted_string |  |
+| Taint externally controlled string | test.py:39 | test.py:39:22:39:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:42 | test.py:42:15:42:28 | tainted_string |  |
+| Taint externally controlled string | test.py:40 | test.py:40:9:40:27 | str() |  |  -->  | Taint externally controlled string | test.py:43 | test.py:43:10:43:10 | a |  |
+| Taint externally controlled string | test.py:40 | test.py:40:13:40:26 | tainted_string |  |  -->  | Taint externally controlled string | test.py:40 | test.py:40:9:40:27 | str() |  |
+| Taint externally controlled string | test.py:41 | test.py:41:9:41:29 | bytes() |  |  -->  | Taint externally controlled string | test.py:43 | test.py:43:13:43:13 | b |  |
+| Taint externally controlled string | test.py:41 | test.py:41:15:41:28 | tainted_string |  |  -->  | Taint externally controlled string | test.py:41 | test.py:41:9:41:29 | bytes() |  |
+| Taint externally controlled string | test.py:42 | test.py:42:9:42:46 | bytes() |  |  -->  | Taint externally controlled string | test.py:43 | test.py:43:16:43:16 | c |  |
+| Taint externally controlled string | test.py:42 | test.py:42:15:42:28 | tainted_string |  |  -->  | Taint externally controlled string | test.py:42 | test.py:42:9:42:46 | bytes() |  |
+| Taint externally controlled string | test.py:45 | test.py:45:22:45:26 | taint | p1 = externally controlled string |  -->  | Taint externally controlled string | test.py:46 | test.py:46:17:46:21 | taint | p1 = externally controlled string |
+| Taint externally controlled string | test.py:46 | test.py:46:17:46:21 | taint | p1 = externally controlled string |  -->  | Taint externally controlled string | test.py:46 | test.py:46:12:46:22 | func() | p1 = externally controlled string |
+| Taint externally controlled string | test.py:46 | test.py:46:17:46:21 | taint | p1 = externally controlled string |  -->  | Taint externally controlled string | test.py:53 | test.py:53:19:53:21 | arg | p0 = externally controlled string |
+| Taint externally controlled string | test.py:53 | test.py:53:19:53:21 | arg | p0 = externally controlled string |  -->  | Taint externally controlled string | test.py:54 | test.py:54:12:54:14 | arg | p0 = externally controlled string |
+| Taint externally controlled string | test.py:57 | test.py:57:11:57:24 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:58 | test.py:58:38:58:40 | ext |  |
+| Taint externally controlled string | test.py:58 | test.py:58:11:58:41 | cross_over() |  |  -->  | Taint externally controlled string | test.py:59 | test.py:59:10:59:12 | res |  |
+| Taint externally controlled string | test.py:58 | test.py:58:38:58:40 | ext |  |  -->  | Taint externally controlled string | test.py:45 | test.py:45:22:45:26 | taint | p1 = externally controlled string |
+| Taint externally controlled string | test.py:58 | test.py:58:38:58:40 | ext |  |  -->  | Taint externally controlled string | test.py:58 | test.py:58:11:58:41 | cross_over() |  |
+| Taint externally controlled string | test.py:70 | test.py:70:22:70:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:71 | test.py:71:18:71:31 | tainted_string |  |
+| Taint externally controlled string | test.py:70 | test.py:70:22:70:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:72 | test.py:72:18:72:31 | tainted_string |  |
+| Taint externally controlled string | test.py:70 | test.py:70:22:70:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:73 | test.py:73:18:73:31 | tainted_string |  |
+| Taint externally controlled string | test.py:70 | test.py:70:22:70:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:74 | test.py:74:19:74:32 | tainted_string |  |
+| Taint externally controlled string | test.py:71 | test.py:71:18:71:31 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:71 | test.py:71:9:71:32 | urlsplit() |  |
+| Taint externally controlled string | test.py:72 | test.py:72:18:72:31 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:72 | test.py:72:9:72:32 | urlparse() |  |
+| Taint externally controlled string | test.py:73 | test.py:73:18:73:31 | tainted_string |  |  -->  | Taint {externally controlled string} | test.py:73 | test.py:73:9:73:32 | parse_qs() |  |
+| Taint externally controlled string | test.py:74 | test.py:74:19:74:32 | tainted_string |  |  -->  | Taint [[externally controlled string]] | test.py:74 | test.py:74:9:74:33 | parse_qsl() |  |
+| Taint externally controlled string | test.py:78 | test.py:78:22:78:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:80 | test.py:80:9:80:22 | tainted_string |  |
+| Taint externally controlled string | test.py:78 | test.py:78:22:78:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:82 | test.py:82:12:82:25 | tainted_string |  |
+| Taint externally controlled string | test.py:80 | test.py:80:9:80:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:80 | test.py:80:9:80:30 | Attribute() |  |
+| Taint externally controlled string | test.py:80 | test.py:80:9:80:30 | Attribute() |  |  -->  | Taint externally controlled string | test.py:85 | test.py:85:10:85:10 | a |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:91 | test.py:91:9:91:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:92 | test.py:92:9:92:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:93 | test.py:93:9:93:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:94 | test.py:94:9:94:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:95 | test.py:95:9:95:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:96 | test.py:96:9:96:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:97 | test.py:97:9:97:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:98 | test.py:98:9:98:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:99 | test.py:99:9:99:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:100 | test.py:100:9:100:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:101 | test.py:101:9:101:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:102 | test.py:102:9:102:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:103 | test.py:103:9:103:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:104 | test.py:104:9:104:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:105 | test.py:105:9:105:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:106 | test.py:106:9:106:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:107 | test.py:107:9:107:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:108 | test.py:108:9:108:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:109 | test.py:109:9:109:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:110 | test.py:110:9:110:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:111 | test.py:111:9:111:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:112 | test.py:112:9:112:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:113 | test.py:113:9:113:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:114 | test.py:114:9:114:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:115 | test.py:115:9:115:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:116 | test.py:116:9:116:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:117 | test.py:117:9:117:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:118 | test.py:118:9:118:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:121 | test.py:121:9:121:22 | tainted_string |  |
+| Taint externally controlled string | test.py:88 | test.py:88:22:88:35 | TAINTED_STRING |  |  -->  | Taint externally controlled string | test.py:122 | test.py:122:9:122:22 | tainted_string |  |
+| Taint externally controlled string | test.py:91 | test.py:91:9:91:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:91 | test.py:91:9:91:35 | Attribute() |  |
+| Taint externally controlled string | test.py:92 | test.py:92:9:92:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:92 | test.py:92:9:92:33 | Attribute() |  |
+| Taint externally controlled string | test.py:93 | test.py:93:9:93:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:93 | test.py:93:9:93:31 | Attribute() |  |
+| Taint externally controlled string | test.py:94 | test.py:94:9:94:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:94 | test.py:94:9:94:38 | Attribute() |  |
+| Taint externally controlled string | test.py:95 | test.py:95:9:95:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:95 | test.py:95:9:95:38 | Attribute() |  |
+| Taint externally controlled string | test.py:95 | test.py:95:9:95:38 | Attribute() |  |  -->  | Taint externally controlled string | test.py:95 | test.py:95:9:95:54 | Attribute() |  |
 | Taint externally controlled string | test.py:96 | test.py:96:9:96:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:96 | test.py:96:9:96:35 | Attribute() |  |
-| Taint externally controlled string | test.py:97 | test.py:97:9:97:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:97 | test.py:97:9:97:37 | Attribute() |  |
-| Taint externally controlled string | test.py:98 | test.py:98:9:98:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:98 | test.py:98:9:98:37 | Attribute() |  |
-| Taint externally controlled string | test.py:99 | test.py:99:9:99:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:99 | test.py:99:9:99:42 | Attribute() |  |
-| Taint externally controlled string | test.py:100 | test.py:100:9:100:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:100 | test.py:100:9:100:33 | Attribute() |  |
-| Taint externally controlled string | test.py:101 | test.py:101:9:101:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:101 | test.py:101:9:101:38 | Attribute() |  |
-| Taint externally controlled string | test.py:102 | test.py:102:9:102:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:102 | test.py:102:9:102:38 | Attribute() |  |
+| Taint externally controlled string | test.py:97 | test.py:97:9:97:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:97 | test.py:97:9:97:37 | Attribute() |  |
+| Taint externally controlled string | test.py:98 | test.py:98:9:98:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:98 | test.py:98:9:98:46 | Attribute() |  |
+| Taint externally controlled string | test.py:99 | test.py:99:9:99:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:99 | test.py:99:9:99:33 | Attribute() |  |
+| Taint externally controlled string | test.py:100 | test.py:100:9:100:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:100 | test.py:100:9:100:30 | Attribute() |  |
+| Taint externally controlled string | test.py:101 | test.py:101:9:101:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:101 | test.py:101:9:101:31 | Attribute() |  |
+| Taint externally controlled string | test.py:102 | test.py:102:9:102:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:102 | test.py:102:9:102:35 | Attribute() |  |
 | Taint externally controlled string | test.py:103 | test.py:103:9:103:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:103 | test.py:103:9:103:37 | Attribute() |  |
 | Taint externally controlled string | test.py:104 | test.py:104:9:104:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:104 | test.py:104:9:104:37 | Attribute() |  |
-| Taint externally controlled string | test.py:105 | test.py:105:9:105:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:105 | test.py:105:9:105:31 | Attribute() |  |
-| Taint externally controlled string | test.py:106 | test.py:106:9:106:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:106 | test.py:106:9:106:30 | Attribute() |  |
-| Taint externally controlled string | test.py:107 | test.py:107:9:107:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:107 | test.py:107:9:107:30 | Attribute() |  |
-| Taint externally controlled string | test.py:108 | test.py:108:9:108:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:108 | test.py:108:9:108:35 | Attribute() |  |
-| Taint externally controlled string | test.py:109 | test.py:109:9:109:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:109 | test.py:109:9:109:35 | Attribute() |  |
-| Taint externally controlled string | test.py:110 | test.py:110:9:110:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:110 | test.py:110:9:110:30 | Attribute() |  |
-| Taint externally controlled string | test.py:111 | test.py:111:9:111:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:111 | test.py:111:9:111:33 | Attribute() |  |
-| Taint externally controlled string | test.py:112 | test.py:112:9:112:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:112 | test.py:112:9:112:30 | Attribute() |  |
-| Taint externally controlled string | test.py:115 | test.py:115:9:115:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:115 | test.py:115:9:115:30 | Attribute() |  |
-| Taint externally controlled string | test.py:116 | test.py:116:9:116:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:116 | test.py:116:9:116:33 | Attribute() |  |
-| Taint externally controlled string | test.py:127 | test.py:127:5:127:29 | For |  |  -->  | Taint externally controlled string | test.py:128 | test.py:128:14:128:17 | line |  |
-| Taint file[externally controlled string] | test.py:120 | test.py:120:20:120:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:122 | test.py:122:9:122:20 | tainted_file |  |
-| Taint file[externally controlled string] | test.py:120 | test.py:120:20:120:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:123 | test.py:123:9:123:20 | tainted_file |  |
-| Taint file[externally controlled string] | test.py:120 | test.py:120:20:120:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:124 | test.py:124:9:124:20 | tainted_file |  |
-| Taint file[externally controlled string] | test.py:120 | test.py:120:20:120:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:125 | test.py:125:9:125:20 | tainted_file |  |
-| Taint file[externally controlled string] | test.py:120 | test.py:120:20:120:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:127 | test.py:127:17:127:28 | tainted_file |  |
-| Taint file[externally controlled string] | test.py:123 | test.py:123:9:123:20 | tainted_file |  |  -->  | Taint externally controlled string | test.py:123 | test.py:123:9:123:27 | Attribute() |  |
-| Taint file[externally controlled string] | test.py:124 | test.py:124:9:124:20 | tainted_file |  |  -->  | Taint externally controlled string | test.py:124 | test.py:124:9:124:31 | Attribute() |  |
-| Taint file[externally controlled string] | test.py:125 | test.py:125:9:125:20 | tainted_file |  |  -->  | Taint [externally controlled string] | test.py:125 | test.py:125:9:125:32 | Attribute() |  |
-| Taint file[externally controlled string] | test.py:127 | test.py:127:17:127:28 | tainted_file |  |  -->  | Taint externally controlled string | test.py:127 | test.py:127:5:127:29 | For |  |
-| Taint json[externally controlled string] | test.py:6 | test.py:6:20:6:45 | Attribute() |  |  -->  | Taint json[externally controlled string] | test.py:7 | test.py:7:9:7:20 | tainted_json |  |
-| Taint json[externally controlled string] | test.py:7 | test.py:7:9:7:20 | tainted_json |  |  -->  | Taint externally controlled string | test.py:7 | test.py:7:9:7:25 | Subscript |  |
-| Taint json[externally controlled string] | test.py:7 | test.py:7:9:7:20 | tainted_json |  |  -->  | Taint json[externally controlled string] | test.py:7 | test.py:7:9:7:25 | Subscript |  |
-| Taint json[externally controlled string] | test.py:7 | test.py:7:9:7:25 | Subscript |  |  -->  | Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:9 | a |  |
-| Taint json[externally controlled string] | test.py:7 | test.py:7:9:7:25 | Subscript |  |  -->  | Taint json[externally controlled string] | test.py:10 | test.py:10:10:10:10 | a |  |
-| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:9 | a |  |  -->  | Taint externally controlled string | test.py:8 | test.py:8:9:8:18 | Attribute() |  |
-| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:9 | a |  |  -->  | Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:18 | Attribute() |  |
-| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:18 | Attribute() |  |  -->  | Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:9 | b |  |
-| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:18 | Attribute() |  |  -->  | Taint json[externally controlled string] | test.py:10 | test.py:10:13:10:13 | b |  |
-| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:9 | b |  |  -->  | Taint externally controlled string | test.py:9 | test.py:9:9:9:14 | Subscript |  |
-| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:9 | b |  |  -->  | Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:14 | Subscript |  |
-| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:14 | Subscript |  |  -->  | Taint json[externally controlled string] | test.py:10 | test.py:10:16:10:16 | c |  |
+| Taint externally controlled string | test.py:105 | test.py:105:9:105:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:105 | test.py:105:9:105:42 | Attribute() |  |
+| Taint externally controlled string | test.py:106 | test.py:106:9:106:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:106 | test.py:106:9:106:33 | Attribute() |  |
+| Taint externally controlled string | test.py:107 | test.py:107:9:107:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:107 | test.py:107:9:107:38 | Attribute() |  |
+| Taint externally controlled string | test.py:108 | test.py:108:9:108:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:108 | test.py:108:9:108:38 | Attribute() |  |
+| Taint externally controlled string | test.py:109 | test.py:109:9:109:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:109 | test.py:109:9:109:37 | Attribute() |  |
+| Taint externally controlled string | test.py:110 | test.py:110:9:110:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:110 | test.py:110:9:110:37 | Attribute() |  |
+| Taint externally controlled string | test.py:111 | test.py:111:9:111:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:111 | test.py:111:9:111:31 | Attribute() |  |
+| Taint externally controlled string | test.py:112 | test.py:112:9:112:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:112 | test.py:112:9:112:30 | Attribute() |  |
+| Taint externally controlled string | test.py:113 | test.py:113:9:113:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:113 | test.py:113:9:113:30 | Attribute() |  |
+| Taint externally controlled string | test.py:114 | test.py:114:9:114:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:114 | test.py:114:9:114:35 | Attribute() |  |
+| Taint externally controlled string | test.py:115 | test.py:115:9:115:22 | tainted_string |  |  -->  | Taint [externally controlled string] | test.py:115 | test.py:115:9:115:35 | Attribute() |  |
+| Taint externally controlled string | test.py:116 | test.py:116:9:116:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:116 | test.py:116:9:116:30 | Attribute() |  |
+| Taint externally controlled string | test.py:117 | test.py:117:9:117:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:117 | test.py:117:9:117:33 | Attribute() |  |
+| Taint externally controlled string | test.py:118 | test.py:118:9:118:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:118 | test.py:118:9:118:30 | Attribute() |  |
+| Taint externally controlled string | test.py:121 | test.py:121:9:121:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:121 | test.py:121:9:121:30 | Attribute() |  |
+| Taint externally controlled string | test.py:122 | test.py:122:9:122:22 | tainted_string |  |  -->  | Taint externally controlled string | test.py:122 | test.py:122:9:122:33 | Attribute() |  |
+| Taint externally controlled string | test.py:133 | test.py:133:5:133:29 | For |  |  -->  | Taint externally controlled string | test.py:134 | test.py:134:14:134:17 | line |  |
+| Taint file[externally controlled string] | test.py:126 | test.py:126:20:126:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:128 | test.py:128:9:128:20 | tainted_file |  |
+| Taint file[externally controlled string] | test.py:126 | test.py:126:20:126:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:129 | test.py:129:9:129:20 | tainted_file |  |
+| Taint file[externally controlled string] | test.py:126 | test.py:126:20:126:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:130 | test.py:130:9:130:20 | tainted_file |  |
+| Taint file[externally controlled string] | test.py:126 | test.py:126:20:126:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:131 | test.py:131:9:131:20 | tainted_file |  |
+| Taint file[externally controlled string] | test.py:126 | test.py:126:20:126:31 | TAINTED_FILE |  |  -->  | Taint file[externally controlled string] | test.py:133 | test.py:133:17:133:28 | tainted_file |  |
+| Taint file[externally controlled string] | test.py:129 | test.py:129:9:129:20 | tainted_file |  |  -->  | Taint externally controlled string | test.py:129 | test.py:129:9:129:27 | Attribute() |  |
+| Taint file[externally controlled string] | test.py:130 | test.py:130:9:130:20 | tainted_file |  |  -->  | Taint externally controlled string | test.py:130 | test.py:130:9:130:31 | Attribute() |  |
+| Taint file[externally controlled string] | test.py:131 | test.py:131:9:131:20 | tainted_file |  |  -->  | Taint [externally controlled string] | test.py:131 | test.py:131:9:131:32 | Attribute() |  |
+| Taint file[externally controlled string] | test.py:133 | test.py:133:17:133:28 | tainted_file |  |  -->  | Taint externally controlled string | test.py:133 | test.py:133:5:133:29 | For |  |
+| Taint json[externally controlled string] | test.py:7 | test.py:7:20:7:45 | Attribute() |  |  -->  | Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:20 | tainted_json |  |
+| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:20 | tainted_json |  |  -->  | Taint externally controlled string | test.py:8 | test.py:8:9:8:25 | Subscript |  |
+| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:20 | tainted_json |  |  -->  | Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:25 | Subscript |  |
+| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:25 | Subscript |  |  -->  | Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:9 | a |  |
+| Taint json[externally controlled string] | test.py:8 | test.py:8:9:8:25 | Subscript |  |  -->  | Taint json[externally controlled string] | test.py:11 | test.py:11:10:11:10 | a |  |
+| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:9 | a |  |  -->  | Taint externally controlled string | test.py:9 | test.py:9:9:9:18 | Attribute() |  |
+| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:9 | a |  |  -->  | Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:18 | Attribute() |  |
+| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:18 | Attribute() |  |  -->  | Taint json[externally controlled string] | test.py:10 | test.py:10:9:10:9 | b |  |
+| Taint json[externally controlled string] | test.py:9 | test.py:9:9:9:18 | Attribute() |  |  -->  | Taint json[externally controlled string] | test.py:11 | test.py:11:13:11:13 | b |  |
+| Taint json[externally controlled string] | test.py:10 | test.py:10:9:10:9 | b |  |  -->  | Taint externally controlled string | test.py:10 | test.py:10:9:10:14 | Subscript |  |
+| Taint json[externally controlled string] | test.py:10 | test.py:10:9:10:9 | b |  |  -->  | Taint json[externally controlled string] | test.py:10 | test.py:10:9:10:14 | Subscript |  |
+| Taint json[externally controlled string] | test.py:10 | test.py:10:9:10:14 | Subscript |  |  -->  | Taint json[externally controlled string] | test.py:11 | test.py:11:16:11:16 | c |  |
+| Taint {externally controlled string} | test.py:73 | test.py:73:9:73:32 | parse_qs() |  |  -->  | Taint {externally controlled string} | test.py:75 | test.py:75:16:75:16 | c |  |
diff --git a/python/ql/test/library-tests/taint/strings/TestTaint.expected b/python/ql/test/library-tests/taint/strings/TestTaint.expected
index 46b772a9ee91..afc30f988999 100644
--- a/python/ql/test/library-tests/taint/strings/TestTaint.expected
+++ b/python/ql/test/library-tests/taint/strings/TestTaint.expected
@@ -1,61 +1,63 @@
-| test.py:10 | test_json | a | externally controlled string |
-| test.py:10 | test_json | a | json[externally controlled string] |
-| test.py:10 | test_json | b | externally controlled string |
-| test.py:10 | test_json | b | json[externally controlled string] |
-| test.py:10 | test_json | c | externally controlled string |
-| test.py:10 | test_json | c | json[externally controlled string] |
-| test.py:21 | test_str | a | externally controlled string |
-| test.py:21 | test_str | b | externally controlled string |
-| test.py:21 | test_str | c | externally controlled string |
-| test.py:21 | test_str | d | externally controlled string |
-| test.py:21 | test_str | e | externally controlled string |
-| test.py:21 | test_str | f | externally controlled string |
-| test.py:21 | test_str | g | externally controlled string |
-| test.py:26 | test_const_sanitizer1 | tainted_string | NO TAINT |
-| test.py:28 | test_const_sanitizer1 | tainted_string | externally controlled string |
-| test.py:33 | test_const_sanitizer2 | tainted_string | NO TAINT |
-| test.py:35 | test_const_sanitizer2 | tainted_string | externally controlled string |
-| test.py:42 | test_str2 | a | externally controlled string |
-| test.py:42 | test_str2 | b | externally controlled string |
-| test.py:42 | test_str2 | c | externally controlled string |
-| test.py:50 | test_exc_info | res | exception.info |
-| test.py:58 | test_untrusted | res | externally controlled string |
-| test.py:69 | test_urlsplit_urlparse | urlparse_res | [externally controlled string] |
-| test.py:69 | test_urlsplit_urlparse | urlsplit_res | [externally controlled string] |
-| test.py:79 | test_method_reference | a | externally controlled string |
-| test.py:79 | test_method_reference | b | NO TAINT |
-| test.py:85 | test_str_methods | Attribute() | externally controlled string |
-| test.py:86 | test_str_methods | Attribute() | externally controlled string |
-| test.py:87 | test_str_methods | Attribute() | externally controlled string |
-| test.py:88 | test_str_methods | Attribute() | externally controlled string |
-| test.py:89 | test_str_methods | Attribute() | externally controlled string |
-| test.py:90 | test_str_methods | Attribute() | externally controlled string |
+| test.py:11 | test_json | a | externally controlled string |
+| test.py:11 | test_json | a | json[externally controlled string] |
+| test.py:11 | test_json | b | externally controlled string |
+| test.py:11 | test_json | b | json[externally controlled string] |
+| test.py:11 | test_json | c | externally controlled string |
+| test.py:11 | test_json | c | json[externally controlled string] |
+| test.py:22 | test_str | a | externally controlled string |
+| test.py:22 | test_str | b | externally controlled string |
+| test.py:22 | test_str | c | externally controlled string |
+| test.py:22 | test_str | d | externally controlled string |
+| test.py:22 | test_str | e | externally controlled string |
+| test.py:22 | test_str | f | externally controlled string |
+| test.py:22 | test_str | g | externally controlled string |
+| test.py:27 | test_const_sanitizer1 | tainted_string | NO TAINT |
+| test.py:29 | test_const_sanitizer1 | tainted_string | externally controlled string |
+| test.py:34 | test_const_sanitizer2 | tainted_string | NO TAINT |
+| test.py:36 | test_const_sanitizer2 | tainted_string | externally controlled string |
+| test.py:43 | test_str2 | a | externally controlled string |
+| test.py:43 | test_str2 | b | externally controlled string |
+| test.py:43 | test_str2 | c | externally controlled string |
+| test.py:51 | test_exc_info | res | exception.info |
+| test.py:59 | test_untrusted | res | externally controlled string |
+| test.py:75 | test_urlsplit_urlparse | a | [externally controlled string] |
+| test.py:75 | test_urlsplit_urlparse | b | [externally controlled string] |
+| test.py:75 | test_urlsplit_urlparse | c | {externally controlled string} |
+| test.py:75 | test_urlsplit_urlparse | d | [[externally controlled string]] |
+| test.py:85 | test_method_reference | a | externally controlled string |
+| test.py:85 | test_method_reference | b | NO TAINT |
 | test.py:91 | test_str_methods | Attribute() | externally controlled string |
 | test.py:92 | test_str_methods | Attribute() | externally controlled string |
 | test.py:93 | test_str_methods | Attribute() | externally controlled string |
 | test.py:94 | test_str_methods | Attribute() | externally controlled string |
 | test.py:95 | test_str_methods | Attribute() | externally controlled string |
 | test.py:96 | test_str_methods | Attribute() | externally controlled string |
-| test.py:97 | test_str_methods | Attribute() | [externally controlled string] |
-| test.py:98 | test_str_methods | Subscript | externally controlled string |
+| test.py:97 | test_str_methods | Attribute() | externally controlled string |
+| test.py:98 | test_str_methods | Attribute() | externally controlled string |
 | test.py:99 | test_str_methods | Attribute() | externally controlled string |
 | test.py:100 | test_str_methods | Attribute() | externally controlled string |
-| test.py:101 | test_str_methods | Attribute() | [externally controlled string] |
-| test.py:102 | test_str_methods | Subscript | externally controlled string |
+| test.py:101 | test_str_methods | Attribute() | externally controlled string |
+| test.py:102 | test_str_methods | Attribute() | externally controlled string |
 | test.py:103 | test_str_methods | Attribute() | [externally controlled string] |
 | test.py:104 | test_str_methods | Subscript | externally controlled string |
 | test.py:105 | test_str_methods | Attribute() | externally controlled string |
-| test.py:106 | test_str_methods | Attribute() | [externally controlled string] |
-| test.py:107 | test_str_methods | Subscript | externally controlled string |
-| test.py:108 | test_str_methods | Attribute() | [externally controlled string] |
-| test.py:109 | test_str_methods | Subscript | externally controlled string |
-| test.py:110 | test_str_methods | Attribute() | externally controlled string |
+| test.py:106 | test_str_methods | Attribute() | externally controlled string |
+| test.py:107 | test_str_methods | Attribute() | [externally controlled string] |
+| test.py:108 | test_str_methods | Subscript | externally controlled string |
+| test.py:109 | test_str_methods | Attribute() | [externally controlled string] |
+| test.py:110 | test_str_methods | Subscript | externally controlled string |
 | test.py:111 | test_str_methods | Attribute() | externally controlled string |
-| test.py:112 | test_str_methods | Attribute() | externally controlled string |
-| test.py:115 | test_str_methods | Attribute() | externally controlled string |
+| test.py:112 | test_str_methods | Attribute() | [externally controlled string] |
+| test.py:113 | test_str_methods | Subscript | externally controlled string |
+| test.py:114 | test_str_methods | Attribute() | [externally controlled string] |
+| test.py:115 | test_str_methods | Subscript | externally controlled string |
 | test.py:116 | test_str_methods | Attribute() | externally controlled string |
-| test.py:122 | test_tainted_file | tainted_file | file[externally controlled string] |
-| test.py:123 | test_tainted_file | Attribute() | externally controlled string |
-| test.py:124 | test_tainted_file | Attribute() | externally controlled string |
-| test.py:125 | test_tainted_file | Attribute() | [externally controlled string] |
-| test.py:128 | test_tainted_file | line | externally controlled string |
+| test.py:117 | test_str_methods | Attribute() | externally controlled string |
+| test.py:118 | test_str_methods | Attribute() | externally controlled string |
+| test.py:121 | test_str_methods | Attribute() | externally controlled string |
+| test.py:122 | test_str_methods | Attribute() | externally controlled string |
+| test.py:128 | test_tainted_file | tainted_file | file[externally controlled string] |
+| test.py:129 | test_tainted_file | Attribute() | externally controlled string |
+| test.py:130 | test_tainted_file | Attribute() | externally controlled string |
+| test.py:131 | test_tainted_file | Attribute() | [externally controlled string] |
+| test.py:134 | test_tainted_file | line | externally controlled string |
diff --git a/python/ql/test/library-tests/taint/strings/test.py b/python/ql/test/library-tests/taint/strings/test.py
index d202e9edda23..78a0712cecaf 100644
--- a/python/ql/test/library-tests/taint/strings/test.py
+++ b/python/ql/test/library-tests/taint/strings/test.py
@@ -1,5 +1,6 @@
 import json
 from copy import copy
+import sys
 
 def test_json():
     tainted_string = TAINTED_STRING
@@ -60,13 +61,18 @@ def test_untrusted():
 def exc_untrusted_call(arg):
     return arg
 
-from six.moves.urllib.parse import urlsplit, urlparse
+if sys.version_info[0] == 2:
+    from urlparse import urlsplit, urlparse, parse_qs, parse_qsl
+if sys.version_info[0] == 3:
+    from urllib.parse import urlsplit, urlparse, parse_qs, parse_qsl
 
 def test_urlsplit_urlparse():
     tainted_string = TAINTED_STRING
-    urlsplit_res = urlsplit(tainted_string)
-    urlparse_res = urlparse(tainted_string)
-    test(urlsplit_res, urlparse_res)
+    a = urlsplit(tainted_string)
+    b = urlparse(tainted_string)
+    c = parse_qs(tainted_string)
+    d = parse_qsl(tainted_string)
+    test(a, b, c, d)
 
 def test_method_reference():
     tainted_string = TAINTED_STRING