Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r16308 -r16339
--- branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 16308)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 16339)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 16308 2016-01-17 11:36:43Z alex $
+* @version	$Id: categories_tag_processor.php 16339 2016-04-02 13:45:52Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -473,7 +473,7 @@
 		list($index_file, $env) = explode('|', $this->Application->RecallVar(rtrim('last_template_'.$wid, '_')), 2);
 
 		$vars_backup = Array ();
-		$vars = $this->Application->processQueryString( str_replace('%5C', '\\', $env) );
+		$vars = $this->Application->processQueryString($env);
 
 		foreach ($vars as $var_name => $var_value) {
 			$vars_backup[$var_name] = $this->Application->GetVar($var_name);
@@ -1010,14 +1010,16 @@
 		}
 
 		// 3. suggestion not found in database, ask webservice
-		$app_id = $this->Application->ConfigValue('YahooApplicationId');
-		$url = 'http://search.yahooapis.com/WebSearchService/V1/spellingSuggestion?appid=' . $app_id . '&query=';
-
 		$curl_helper = $this->Application->recallObject('CurlHelper');
 		/* @var $curl_helper kCurlHelper */
 
-		$xml_data = $curl_helper->Send( $url . kUtil::escape($keywords, kUtil::ESCAPE_URL) );
+		$curl_helper->SetRequestData(array(
+			'appid' => $this->Application->ConfigValue('YahooApplicationId'),
+			'query' => $keywords,
+		));
 
+		$xml_data = $curl_helper->Send('http://search.yahooapis.com/WebSearchService/V1/spellingSuggestion');
+
 		$xml_helper = $this->Application->recallObject('kXMLHelper');
 		/* @var $xml_helper kXMLHelper */
 
@@ -1464,10 +1466,10 @@
 		$template = $this->Application->GetVar('t');
 		$theme_id = $this->Application->GetVar('m_theme');
 
-		$url_params = Array ('block' => '#BLOCK#', 'theme-file_event' => '#EVENT#', 'theme_id' => $theme_id, 'source' => $template, 'pass' => 'all,theme-file', 'front' => 1, 'm_opener' => 'd', '__NO_REWRITE__' => 1, 'no_amp' => 1);
+		$url_params = Array ('block' => '#BLOCK#', 'theme-file_event' => '#EVENT#', 'theme_id' => $theme_id, 'source' => $template, 'pass' => 'all,theme-file', 'front' => 1, 'm_opener' => 'd', '__NO_REWRITE__' => 1);
 		$edit_template_url = $this->Application->HREF('themes/template_edit', ADMIN_DIRECTORY, $url_params, 'index.php');
 
-		$url_params = Array ('theme-file_event' => 'OnSaveLayout', 'source' => $template, 'pass' => 'all,theme-file', '__NO_REWRITE__' => 1, 'no_amp' => 1);
+		$url_params = Array ('theme-file_event' => 'OnSaveLayout', 'source' => $template, 'pass' => 'all,theme-file', '__NO_REWRITE__' => 1);
 		$save_layout_url = $this->Application->HREF('index', '', $url_params);
 
 		$page =& $this->_getPage($params);
@@ -1479,7 +1481,7 @@
 			'pageId' => $page->GetID(),
 			'pageInfo' => $page->isLoaded() ? $page_helper->getPageInfo( $page->GetID() ) : Array (),
 			'editUrl' => $edit_template_url,
-			'browseUrl' => $this->Application->HREF('', '', Array ('editing_mode' => '#EDITING_MODE#', '__NO_REWRITE__' => 1, 'no_amp' => 1)),
+			'browseUrl' => $this->Application->HREF('', '', Array ('editing_mode' => '#EDITING_MODE#', '__NO_REWRITE__' => 1)),
 			'saveLayoutUrl' => $save_layout_url,
 			'editingMode' => (int)EDITING_MODE,
 		);
@@ -1499,7 +1501,7 @@
 			$ret .= "var base_url = '" . $this->Application->BaseURL() . "';" . "\n";
 			$ret .= 'TB.closeHtml = \'<img src="' . $js_url . '/../img/close_window15.gif" width="15" height="15" style="border-width: 0px;" alt="close"/><br/>\';' . "\n";
 
-			$url_params = Array ('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', '__NO_REWRITE__' => 1, 'no_amp' => 1);
+			$url_params = Array ('m_theme' => '', 'pass' => 'm', 'm_opener' => 'r', '__NO_REWRITE__' => 1);
 			$browse_url = $this->Application->HREF('catalog/catalog', ADMIN_DIRECTORY, $url_params, 'index.php');
 			$browse_url = preg_replace('/&(admin|editing_mode)=[\d]/', '', $browse_url);
 
@@ -1584,7 +1586,6 @@
 					'theme_event'	=>	'OnEdit',
 					'theme-file_id' =>	$this->_getThemeFileId(),
 					'front'			=>	1,
-					'__URLENCODE__'	=>	1,
 					'__NO_REWRITE__'=>	1,
 					'index_file' => 'index.php',
 				);
@@ -1701,7 +1702,6 @@
 					'pass'			=>	'm',
 					'm_opener'		=>	'd',
 					'm_cat_id'		=>	$page->GetID(),
-					'__URLENCODE__'	=>	1,
 					'__NO_REWRITE__'=>	1,
 					'front'			=>	1,
 					'index_file' => 'index.php',