diff --git a/docs/upgrades/upgrade_6.8.8-6.99.0.pl b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
index 6c1102417..bd1f624e6 100644
--- a/docs/upgrades/upgrade_6.8.8-6.99.0.pl
+++ b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
@@ -102,7 +102,7 @@ sub changeCache {
 	$session->db->write("alter table Folder add column visitorCacheTimeout int not null default 3600");
 	$session->db->write("alter table HttpProxy add column cacheTimeout int not null default 0");
 	$session->db->write("alter table SQLReport add column cacheTimeout int not null default 0");
-	$session->db->write("alter table Snippet add column cacheTimeout int not null default 3600");
+	$session->db->write("alter table snippet add column cacheTimeout int not null default 3600");
 	$session->db->write("alter table FileAsset add column cacheTimeout int not null default 3600");
 	$session->db->write("alter table Product add column cacheTimeout int not null default 3600");
 	$session->db->write("alter table SyndicatedContent add column cacheTimeout int not null default 3600");
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index 64fc3b778..838677068 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -134,7 +134,7 @@ sub www_viewStatistics {
 	$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(147).':</td><td class="tableData">'.$data.'</td></tr>';
 	($data) = $session->db->quickArray("select count(distinct assetId) from assetData where isPackage=1");
 	$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(794).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = $session->db->quickArray("select count(*) from template");
+	($data) = $session->db->quickArray("select count(distinct(assetId)) from template");
 	$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(792).':</td><td class="tableData">'.$data.'</td></tr>';
 	($data) = $session->db->quickArray("select count(*) from userSession");
 	$output .= '<tr><td align="right" class="tableHeader">'.$i18n->get(146).':</td><td class="tableData">'.$data.'</td></tr>';
diff --git a/lib/WebGUI/SQL/ResultSet.pm b/lib/WebGUI/SQL/ResultSet.pm
index 6b2556c56..d4b7d4737 100644
--- a/lib/WebGUI/SQL/ResultSet.pm
+++ b/lib/WebGUI/SQL/ResultSet.pm
@@ -117,6 +117,7 @@ sub execute {
 	my $self = shift;
 	my $placeholders = shift || [];
 	my $sql = $self->{_sql};
+	$self->db->session->errorHandler->query($sql,$placeholders);
 	$self->sth->execute(@{ $placeholders }) or $self->db->session->errorHandler->fatal("Couldn't execute prepared statement: $sql : With place holders: ".join(", ", @{$placeholders}).".  Root cause: ". $self->errorMessage);
 }
 
@@ -203,7 +204,6 @@ sub prepare {
 	my $class = shift;
 	my $sql = shift;
 	my $db = shift;
-	$db->session->errorHandler->query($sql);
 	my $sth = $db->dbh->prepare($sql) or $db->session->errorHandler->fatal("Couldn't prepare statement: ".$sql." : ". $db->dbh->errstr);
 	bless {_sth => $sth, _sql => $sql, _db=>$db}, $class;
 }
@@ -292,7 +292,7 @@ sub unconditionalRead {
 	my $sql = shift;
 	my $db = shift;
 	my $placeholders = shift;
-	$db->session->errorHandler->query($sql);
+	$db->session->errorHandler->query($sql,$placeholders);
         my $sth = $db->dbh->prepare($sql) or $db->session->errorHandler->warn("Unconditional read failed: ".$sql." : ".$db->dbh->errstr);
         if ($sth) {
         	$sth->execute(@$placeholders) or $db->session->errorHandler->warn("Unconditional read failed: ".$sql." : ".$sth->errstr);
diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm
index c4401751d..052b129e6 100644
--- a/lib/WebGUI/Session/ErrorHandler.pm
+++ b/lib/WebGUI/Session/ErrorHandler.pm
@@ -336,8 +336,11 @@ A sql statement string.
 
 sub query {
 	my $self = shift;
+	my $query = shift;
+	my $placeholders = shift;
 	$self->{_queryCount}++;
-	$self->debug("query  ".$self->{_queryCount}.':  '.shift);
+	my $plac = scalar(@{$placeholders}) ? "\n&nbsp;&nbsp;with placeholders:&nbsp;&nbsp;['".join("', '",@{$placeholders})."']" : '';
+	$self->debug("query  ".$self->{_queryCount}.':  '.$query.$plac);
 }