Index: trunk/ippTools/src/difftool.c
===================================================================
--- trunk/ippTools/src/difftool.c	(revision 29627)
+++ trunk/ippTools/src/difftool.c	(revision 29665)
@@ -2050,5 +2050,14 @@
     }
 
-    if (!p_psDBRunQueryF(config->dbh, query, stack2Query, stack1Query, diffQuery0, stack1Query)) {
+
+    psString queryCopy = psStringCopy(query);
+    psFree(query);
+    query = queryCopy;
+    
+    psStringSubstitute(&query, stack1Query, "@STACK1_QUERY@");
+    psStringSubstitute(&query, stack2Query, "@STACK2_QUERY@");
+    psStringSubstitute(&query, diffQuery0,  "@DIFF0_QUERY@");
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
 	psError(PS_ERR_UNKNOWN, false, "database error");
 	psFree(query);
@@ -2121,5 +2130,15 @@
 	psFree(thisWhere);
 
-	psTrace("difftool",1, query,stack2Query,this_stack1Query,diffQuery1,this_stack1Query);
+
+	psString queryCopy = psStringCopy(query);
+	psFree(query);
+	query = queryCopy;
+    
+
+	psStringSubstitute(&query, this_stack1Query, "@STACK1_QUERY@");
+	psStringSubstitute(&query, stack2Query,      "@STACK2_QUERY@");
+	psStringSubstitute(&query, diffQuery1,       "@DIFF1_QUERY@");
+
+	psTrace("difftool", 1, "%s", query);
 	if (!psDBTransaction(config->dbh)) {
 	    psError(PS_ERR_UNKNOWN, false, "database error");