diff --git a/lib/core/agent.py b/lib/core/agent.py
index 364e2b863..1d2716021 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -80,6 +80,9 @@ class Agent:
         if place == PLACE.URI:
             origValue = origValue.split(URI_INJECTION_MARK_CHAR)[0]
             origValue = origValue[origValue.rfind('/') + 1:]
+            for char in ('?', '=', ':'):
+                if char in origValue:
+                    origValue = origValue[origValue.rfind(char) + 1:]
 
         if value is None:
             if where == PAYLOAD.WHERE.ORIGINAL: