diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index adb777c30..09dce8b09 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -440,6 +440,7 @@ class DB
 		$log['query'] = $this->query;
 		$log['elapsed_time'] = $elapsed_time;
 		$log['connection'] = $this->connection;
+		$log['query_id'] = $this->query_id;
 
 		// leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
 		if($this->isError())
@@ -447,7 +448,6 @@ class DB
 			$site_module_info = Context::get('site_module_info');
 			$log['module'] = $site_module_info->module;
 			$log['act'] = Context::get('act');
-			$log['query_id'] = $this->query_id;
 			$log['time'] = date('Y-m-d H:i:s');
 			$log['result'] = 'Failed';
 			$log['errno'] = $this->errno;
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 0d5a4daf7..95a8efeec 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -197,10 +197,10 @@ class DisplayHandler extends Handler
 			// display DB query history
 			if((__DEBUG__ & 4) && $GLOBALS['__db_queries__'])
 			{
-				$queries_output = array(array('Query', 'Elapsed time', 'Result'));
+				$queries_output = array(array('Result', 'Query ID', 'Query', 'Elapsed time'));
 				foreach($GLOBALS['__db_queries__'] as $query)
 				{
-					$queries_output[] = array($query['query'], sprintf('%0.5f', $query['elapsed_time']), $query['result']);
+					$queries_output[] = array($query['result'], $query['query_id'], $query['query'], sprintf('%0.5f', $query['elapsed_time']));
 				}
 				$firephp->fb(
 						array(