diff --git a/tools/reporter/app/query/index.php b/tools/reporter/app/query/index.php
index 0586b0a1be6d..e43911787436 100644
--- a/tools/reporter/app/query/index.php
+++ b/tools/reporter/app/query/index.php
@@ -49,14 +49,18 @@ session_start();
 header("Cache-control: private"); //IE 6 Fix
 printheaders();
 
+$method = 'html';
+
 $title = "Searching Results";
+
 $content = initializeTemplate();
+$content->assign('method', $method);
 
 // Open DB
 $db = NewADOConnection($config['db_dsn']);
 $db->SetFetchMode(ADODB_FETCH_ASSOC);
+$db->debug = true;
 
-// DELETED
 $query = new query;
 $query_input = $query->getQueryInputs();
 
@@ -68,24 +72,25 @@ $result = $query->doQuery($query_input['selected'],
                           $query_input['page'],
                           $query_input['count']
           );
-$output = $query->outputHTML($result, $query_input);
 
+$output = $query->outputHTML($result, $query_input, $continuity_params, $columnHeaders);
 if (sizeof($output['data']) == 0){
     $content->assign('error', 'No Results found');
-    displayPage($content, 'query.tpl');
+    displayPage($content, 'query', 'query.tpl');
     exit;
 }
 
-$content->assign('continuityParams', $query->continuityParams($query_input));
+$continuity_params = $query->continuityParams($query_input);
+$content->assign('continuity_params', $continuity_params);
+$content->assign('column', $query->columnHeaders($query_input, $continuity_params));
+$content->assign('row', $output['data']);
+$content->assign('continuityParams', $continuity_params);
 $content->assign('count', $result['totalResults']);
 $content->assign('show', $query_input['show']);
 $content->assign('page', $query_input['page']);
 
-$content->assign('column', $output['columnHeaders']);
-$content->assign('row', $output['data']);
-displayPage($content, 'query.tpl');
+displayPage($content, 'query', 'query.tpl');
 
 // disconnect database
 $db->Close();
-
 ?>
\ No newline at end of file
diff --git a/tools/reporter/app/report/index.php b/tools/reporter/app/report/index.php
index a90c6dc13783..f3d4f4544c87 100644
--- a/tools/reporter/app/report/index.php
+++ b/tools/reporter/app/report/index.php
@@ -90,6 +90,6 @@ $content->assign('report_description',     $query->fields['report_description'])
 
 $title = 'Mozilla Reporter: '.$query->fields['report_id'];
 
-displayPage($content, 'report.tpl', $title);
+displayPage($content, 'report', 'report.tpl', $title);
 ?>
 
diff --git a/tools/reporter/app/stats/index.php b/tools/reporter/app/stats/index.php
index 09ab2f6ed1d3..f0703726f827 100644
--- a/tools/reporter/app/stats/index.php
+++ b/tools/reporter/app/stats/index.php
@@ -38,7 +38,7 @@
 
 require_once('../../config.inc.php');
 require_once($config['base_path'].'/includes/iolib.inc.php');
-require_once($config['base_path'].'/includes/contrib/adodb/adodb.inc.php');
+require_once($config['base_path'].'/includes/db.inc.php');
 require_once($config['base_path'].'/includes/contrib/smarty/libs/Smarty.class.php');
 require_once($config['base_path'].'/includes/security.inc.php');
 
@@ -50,7 +50,6 @@ header("Cache-control: private"); //IE 6 Fix
 
 // Open DB
 $db = NewADOConnection($config['db_dsn']);
-if (!$db) die("Connection failed");
 $db->SetFetchMode(ADODB_FETCH_ASSOC);
 
 $content = initializeTemplate();
@@ -111,6 +110,6 @@ $db->Close();
 
 $title = "Statistics";
 
-displayPage($content, 'stats.tpl', $title);
+displayPage($content, 'stats', 'stats.tpl');
 ?>
 
diff --git a/tools/reporter/includes/db.inc.php b/tools/reporter/includes/db.inc.php
index bbfaeed5ec28..d96b0052cf02 100644
--- a/tools/reporter/includes/db.inc.php
+++ b/tools/reporter/includes/db.inc.php
@@ -4,8 +4,11 @@ require_once($config['base_path'].'/includes/contrib/adodb/adodb.inc.php');
 class db extends ADOConnection
 {
     function NewADOConnection(){
+        global $config;
         $db = NewADOConnection($config['db_dsn']);
-$db->debug = true;
+        if($config['debug']){
+            $db->debug = true;
+        }
         if (!$db) die("Connection failed");
         return $db;
     }