diff --git a/lib/core/agent.py b/lib/core/agent.py
index ebdbb6e41..63c7e4851 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -301,7 +301,8 @@ class Agent(object):
             ("[SPACE_REPLACE]", kb.chars.space),
             ("[DOLLAR_REPLACE]", kb.chars.dollar),
             ("[HASH_REPLACE]", kb.chars.hash_),
-            ("[GENERIC_SQL_COMMENT]", GENERIC_SQL_COMMENT)
+            ("[GENERIC_SQL_COMMENT]", GENERIC_SQL_COMMENT),
+            ("[ORIGINAL]", origValue or "")
         )
         payload = reduce(lambda x, y: x.replace(y[0], y[1]), replacements, payload)
 
diff --git a/xml/boundaries.xml b/xml/boundaries.xml
index b61dcb6e0..cd954ebcf 100644
--- a/xml/boundaries.xml
+++ b/xml/boundaries.xml
@@ -488,6 +488,17 @@ Formats:
     </boundary>
     <!-- End of pre-WHERE derived table boundaries -->
 
+    <!-- Escaped column name (e.g. SELECT `...` FROM table) boundaries -->
+    <boundary>
+        <level>4</level>
+        <clause>1</clause>
+        <where>1</where>
+        <ptype>1</ptype>
+        <prefix>`</prefix>
+        <suffix> AND `[ORIGINAL]</suffix>
+    </boundary>
+    <!-- End of escaped column name boundaries -->
+
     <!-- AGAINST boolean full-text search boundaries (http://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html) -->
     <boundary>
         <level>4</level>
diff --git a/xml/errors.xml b/xml/errors.xml
index a4c95b2a5..5889f842e 100644
--- a/xml/errors.xml
+++ b/xml/errors.xml
@@ -9,6 +9,7 @@
         <error regexp="MySQLSyntaxErrorException"/>
         <error regexp="valid MySQL result"/>
         <error regexp="check the manual that corresponds to your (MySQL|MariaDB) server version"/>
+        <error regexp="Unknown column '[^ ]+' in 'field list'"/>
         <error regexp="MySqlClient\."/>
         <error regexp="com\.mysql\.jdbc\.exceptions"/>
         <error regexp="Zend_Db_Statement_Mysqli_Exception"/>