Index: kernel/db/db_connection.php
===================================================================
--- kernel/db/db_connection.php	(revision 15426)
+++ kernel/db/db_connection.php	(working copy)
@@ -1100,7 +1100,7 @@
 					$first_cell = substr($first_cell, 0, 50) . ' ...';
 				}
 
-				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), $first_cell, $this->_queryCount, $this->nextQueryCachable, $this->serverIndex);
+				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), $first_cell, $this->_queryCount, $this->nextQueryCachable, $this->serverIndex . ' (' . $this->connectionParams['host'] . ')');
 				$debugger->profilerAddTotal('sql', 'sql_' . $queryID);
 				$this->nextQueryCachable = false;
 			}
@@ -1113,7 +1113,7 @@
 		else {
 			// set 2nd checkpoint: begin
 			if ( $this->_profileSQLs ) {
-				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), null, $this->_queryCount, $this->nextQueryCachable, $this->serverIndex);
+				$debugger->profileFinish('sql_' . $queryID, null, null, $this->getAffectedRows(), null, $this->_queryCount, $this->nextQueryCachable, $this->serverIndex . ' (' . $this->connectionParams['host'] . ')');
 				$debugger->profilerAddTotal('sql', 'sql_' . $queryID);
 				$this->nextQueryCachable = false;
 			}
Index: kernel/utility/debugger.php
===================================================================
--- kernel/utility/debugger.php	(revision 15426)
+++ kernel/utility/debugger.php	(working copy)
@@ -1244,7 +1244,7 @@
 						$this->ProfilerData[$key]['subtitle'] = 'cachable';
 					}
 
-					if ( $func_arguments[7] ) {
+					if ( (string)$func_arguments[7] !== '' ) {
 						$additional[] = Array ('name' => 'Server #', 'value' => $func_arguments[7]);
 					}