diff --git a/src/main/resources/support/http/resources/sql-detail.html b/src/main/resources/support/http/resources/sql-detail.html
index ced573ad86..5f35f98b23 100644
--- a/src/main/resources/support/http/resources/sql-detail.html
+++ b/src/main/resources/support/http/resources/sql-detail.html
@@ -138,7 +138,14 @@
     						if (sqlInfo == null)
     							return;
 
-    						$("#fullSql").text(sqlInfo.SQL)
+							var sql = sqlInfo.SQL;
+							if (sql != null) {
+								sql = sql.replace(/</g,"&lt;").replace(/>/g,"&gt;");
+							} else {
+								sql = '';
+							}
+
+    						$("#fullSql").text(sql)
     						$("#formattedSql").text(sqlInfo.formattedSql)
     						$("#parsedtable").text(sqlInfo.parsedTable)
     						$("#parsedfields").text(sqlInfo.parsedFields)
diff --git a/src/main/resources/support/http/resources/sql.html b/src/main/resources/support/http/resources/sql.html
index dca2ba896e..90f3f93f9a 100644
--- a/src/main/resources/support/http/resources/sql.html
+++ b/src/main/resources/support/http/resources/sql.html
@@ -143,7 +143,7 @@
 	    				var html = "";
 	    				for ( var i = 0; i < sqlStatList.length; i++) {
 	    					var stat = sqlStatList[i], statSQL=stat.SQL;
-	    					var newStatSQL=statSQL.replace(/\"/g,"'");
+	    					var newStatSQL=statSQL.replace(/\"/g,"'").replace(/</g,"&lt;").replace(/>/g,"&gt;");
 	    					var newRow = sqlStatTable.insertRow(-1);
 	    					html += "<tr>";
 	    					html += "<td>" + (i + 1) + "</td>";
diff --git a/src/main/resources/support/http/resources/wall.html b/src/main/resources/support/http/resources/wall.html
index bb249afad9..7b663e78c7 100644
--- a/src/main/resources/support/http/resources/wall.html
+++ b/src/main/resources/support/http/resources/wall.html
@@ -287,8 +287,8 @@
 					if (whiteList) {
 						for ( var i = 0; i < whiteList.length; ++i) {
 							var white = whiteList[i];
-							if (white != null) {
-								white = white.replace(/</g,"&lt;").replace(/>/g,"&gt;");
+							if (white.sql != null) {
+								white.sql = white.sql.replace(/</g,"&lt;").replace(/>/g,"&gt;");
 							}
 
 							html += "<tr>";
@@ -335,8 +335,8 @@
 					if (blackList) {
 						for ( var i = 0; i < blackList.length; ++i) {
 							var black = blackList[i];
-							if (black != null) {
-								black = black.replace(/</g,"&lt;").replace(/>/g,"&gt;");
+							if (black.sql != null) {
+								black.sql = black.sql.replace(/</g,"&lt;").replace(/>/g,"&gt;");
 							}
 
 							html += "<tr>";