Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r3664 -r3685
--- trunk/core/kernel/application.php	(.../application.php)	(revision 3664)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 3685)
@@ -792,6 +792,11 @@
 			$this->SetVar('m_opener', 'p');
 		}
 
+		if ($t == 'incs/close_popup') {
+			// because this template closes the popup and we don't need popup mark here anymore
+			$params['m_opener'] = 's';
+		}
+		
 		if( substr($t, -4) == '.tpl' ) $t = substr($t, 0, strlen($t) - 4 );
 
 		if ( $this->IsAdmin() && $prefix == '') $prefix = '/admin';
Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r3648 -r3685
--- trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 3648)
+++ trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 3685)
@@ -443,16 +443,24 @@
 				}
 			}
 
-			function profileStart($key, $description)
+			function profileStart($key, $description = null)
 			{
 				$timeStamp = $this->getMoment();
-				$this->ProfilerData[$key] = Array('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data), 'description' => $description);
+				$this->ProfilerData[$key] = Array('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data));
+				if (isset($description)) {
+					$this->ProfilerData[$key]['description'] = $description;
+				}
+				
 				$this->Data[] = array('profile_key' => $key, 'debug_type' => 'profiler');
 			}
 
-			function profileFinish($key)
+			function profileFinish($key, $description = null)
 			{
 				$this->ProfilerData[$key]['ends'] = $this->getMoment();
+				
+				if (isset($description)) {
+					$this->ProfilerData[$key]['description'] = $description;
+				}
 			}
 
 			function profilerAddTotal($total_key, $key=null, $value=null)
Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r3670 -r3685
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3670)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 3685)
@@ -162,9 +162,10 @@
 		{
 			if( $this->Application->isDebugMode() )
 			{
-				$this->Application->Debugger->profileStart('url_parsing', 'Parsing <b>MOD_REWRITE</b> url');
+				$this->Application->Debugger->profileStart('url_parsing');
 				$this->processRewriteURL();
-				$this->Application->Debugger->profileFinish('url_parsing');
+				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>'.$this->Get('t').'</b>)';
+				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
 			else
 			{
Index: trunk/kernel/include/debugger.php
===================================================================
diff -u -N -r3648 -r3685
--- trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 3648)
+++ trunk/kernel/include/debugger.php	(.../debugger.php)	(revision 3685)
@@ -443,16 +443,24 @@
 				}	
 			}
 			
-			function profileStart($key, $description)
+			function profileStart($key, $description = null)
 			{
 				$timeStamp = $this->getMoment();
-				$this->ProfilerData[$key] = Array('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data), 'description' => $description);
+				$this->ProfilerData[$key] = Array('begins' => $timeStamp, 'ends' => 5000, 'debuggerRowID' => count($this->Data));
+				if (isset($description)) {
+					$this->ProfilerData[$key]['description'] = $description;
+				}
+				
 				$this->Data[] = array('profile_key' => $key, 'debug_type' => 'profiler');
 			}
 			
-			function profileFinish($key)
+			function profileFinish($key, $description = null)
 			{
 				$this->ProfilerData[$key]['ends'] = $this->getMoment();
+				
+				if (isset($description)) {
+					$this->ProfilerData[$key]['description'] = $description;
+				}
 			}
 			
 			function profilerAddTotal($total_key, $key=null, $value=null)