diff --git a/core/src/main/cfml/context/doc/categories.cfm b/core/src/main/cfml/context/doc/categories.cfm
index fc999e639c..442214a72a 100644
--- a/core/src/main/cfml/context/doc/categories.cfm
+++ b/core/src/main/cfml/context/doc/categories.cfm
@@ -127,8 +127,8 @@
 
 		<div class="tile-wrap tile-wrap-animation">
 			<cfloop index="i"  list="#myList#">
-				<cfquery name="queryList" dbtype="query">
-					SELECT category FROM qryAllItems  WHERE category LIKE '#i#%';
+				<cfquery name="queryList" dbtype="query" params=#["#i#%"]#>
+					SELECT category FROM qryAllItems  WHERE category LIKE ?;
 				</cfquery>
 				<div class="tile tile-collapse tile-collapse-full">
 					<div class="tile-toggle" data-target="##category-#lCase(i)#" data-toggle="tile">
diff --git a/core/src/main/cfml/context/doc/functions.cfm b/core/src/main/cfml/context/doc/functions.cfm
index 45c8f31d2d..2092a47e37 100644
--- a/core/src/main/cfml/context/doc/functions.cfm
+++ b/core/src/main/cfml/context/doc/functions.cfm
@@ -211,8 +211,8 @@
 
 		<div class="tile-wrap tile-wrap-animation">
 			<cfloop index="i"  list="#list#">
-					<cfquery name="queryList" dbtype="query">
-						SELECT functions FROM qryAllItems  WHERE functions LIKE '#i#%';
+					<cfquery name="queryList" dbtype="query" params=#["#i#%"]#>
+						SELECT functions FROM qryAllItems  WHERE functions LIKE ?;
 					</cfquery>
 				<div class="tile tile-collapse tile-collapse-full">
 					<div class="tile-toggle" data-target="##function-#lCase(i)#" data-toggle="tile">
diff --git a/core/src/main/cfml/context/doc/tags.cfm b/core/src/main/cfml/context/doc/tags.cfm
index 1eb48d8dfc..d700a8ac1f 100644
--- a/core/src/main/cfml/context/doc/tags.cfm
+++ b/core/src/main/cfml/context/doc/tags.cfm
@@ -315,10 +315,11 @@
 					<cfset queryList = queryNew("tags")>
 					<cfset QueryAddRow(queryList, ["cf_"])>
 				<cfelse>
-					<cfquery name="queryList" dbtype="query">
-						SELECT tags FROM qryAllItems  WHERE tags LIKE 'cf#i#%';
+					<cfquery name="queryList" dbtype="query" params=#["cf#i#%"]#>
+						SELECT tags FROM qryAllItems  WHERE tags LIKE ?;
 					</cfquery>
 				</cfif>
+				
 				<div class="tile tile-collapse tile-collapse-full">
 					<div class="tile-toggle" data-target="##function-#lCase(i)#" data-toggle="tile">
 						<div class="tile-inner">
@@ -343,4 +344,4 @@
 </cfoutput>
 
 
-</cfmodule><!--- doc_layout !--->
\ No newline at end of file
+</cfmodule><!--- doc_layout !--->
diff --git a/core/src/main/java/resource/component/org/lucee/cfml/Administrator.cfc b/core/src/main/java/resource/component/org/lucee/cfml/Administrator.cfc
index e5ae9850fa..39f3e2fc8a 100755
--- a/core/src/main/java/resource/component/org/lucee/cfml/Administrator.cfc
+++ b/core/src/main/java/resource/component/org/lucee/cfml/Administrator.cfc
@@ -517,12 +517,12 @@ component {
 
 		var mailServers = getMailservers();
 		if( structKeyExists(arguments, 'username') && arguments.username == ''  ){
-			query name="local.existing" dbtype="query"{
-				echo("SELECT * FROM mailservers WHERE hostName = '#arguments.host#' and port = '#arguments.port#' ")
+			query name="local.existing" dbtype="query" params=[arguments.host,arguments.port]{
+				echo("SELECT * FROM mailservers WHERE hostName = ? AND port = ?")
 			}
 		} else{
-			query name="local.existing" dbtype="query"{
-				echo("SELECT * FROM mailservers WHERE hostName = '#arguments.host#' and port = '#arguments.port#' and username = '#arguments.username#' ")
+			query name="local.existing" dbtype="query" params=[arguments.host,arguments.port,arguments.username]{
+				echo("SELECT * FROM mailservers WHERE hostName = ? AND port = ? AND username = ?")
 			}
 		}
 
@@ -1185,8 +1185,8 @@ component {
 		boolean storage
 	){
 		var connections =  getCacheConnections()
-		query name="local.existing" dbtype="query"{
-			echo("SELECT * FROM connections WHERE class = '#arguments.class#' and name = '#arguments.name#' ")
+		query name="local.existing" dbtype="query" params=[arguments.class,arguments.name]{
+			echo("SELECT * FROM connections WHERE class = ? AND name = ?")
 		}
 
 		admin
@@ -1378,8 +1378,8 @@ component {
 	*/
 	public void function updateGatewayEntry( required string id, required string startupMode, string class, string cfcPath, string listenerCfcPath,  struct custom ){
 		var getGatewayEntries = getGatewayEntries();
-		query name="local.existing" dbtype="query"{
-			echo("SELECT * FROM getGatewayEntries WHERE id = '#arguments.id#' and startupMode = '#arguments.startupMode#' ")
+		query name="local.existing" dbtype="query"  params=[arguments.id,arguments.startupMode]{
+			echo("SELECT * FROM getGatewayEntries WHERE id = ? AND startupMode = ?")
 		}
 		admin
 			action="updateGatewayEntry"
@@ -1502,8 +1502,8 @@ component {
 		var driver=drivers[trim(arguments.type)];
 		var meta=getMetaData(driver);
 		var debugEntry = getDebugEntry();
-		query name="local.existing" dbtype="query"{
-			echo("SELECT * FROM debugEntry WHERE label = '#arguments.label#' ");
+		query name="local.existing" dbtype="query"  params=[arguments.label]{
+			echo("SELECT * FROM debugEntry WHERE label = ?");
 		}
 		admin
 			action="updateDebugEntry"
@@ -1972,8 +1972,8 @@ component {
 		,          struct layoutArgs={}
 	){
 		var LogSettings = getLogSettings();
-		query name="local.existing" dbtype="query"{
-			echo("SELECT * FROM LogSettings WHERE name = '#arguments.name#' ");
+		query name="local.existing" dbtype="query"  params=[arguments.name]{
+			echo("SELECT * FROM LogSettings WHERE name = ?");
 		}
 
 		admin