Index: branches/5.2.x/admin_templates/orders/orders_search_list.tpl
===================================================================
diff -u -N -r14258 -r16240
--- branches/5.2.x/admin_templates/orders/orders_search_list.tpl	(.../orders_search_list.tpl)	(revision 14258)
+++ branches/5.2.x/admin_templates/orders/orders_search_list.tpl	(.../orders_search_list.tpl)	(revision 16240)
@@ -29,6 +29,7 @@
  				a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
 				 			set_hidden_field('export_finish_t', 'in-commerce/orders/export/export_finish');
 				 			set_hidden_field('export_progress_t', 'in-commerce/orders/export/export_progress');
+				 			set_hidden_field('grid', 'Search');
 							open_popup('ord.search', 'OnExport', 'in-commerce/orders/export/export');
 						}
 				 	) );
@@ -68,4 +69,4 @@
 <inp2:m_include t="incs/footer"/>
 <script type="text/javascript">
 	set_hidden_field('order_type','search');
-</script>
\ No newline at end of file
+</script>
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r16239 -r16240
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16239)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 16240)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 16239 2015-09-02 20:17:01Z alex $
+* @version	$Id: orders_event_handler.php 16240 2015-09-02 20:22:50Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -3752,24 +3752,8 @@
 	{
 		parent::OnBeforeExportBegin($event);
 
-		$options = $event->getEventParam('options');
-
-		$items_list = $this->Application->recallObject($event->Prefix . '.' . $this->Application->RecallVar('export_oroginal_special'), $event->Prefix . '_List');
-		/* @var $items_list kDBList */
-
-		$items_list->SetPerPage(-1);
-
-		if ( $options['export_ids'] != '' ) {
-			$items_list->AddFilter('export_ids', $items_list->TableName . '.' . $items_list->IDField . ' IN (' . implode(',', $options['export_ids']) . ')');
-		}
-
-		$options['ForceCountSQL'] = $items_list->getCountSQL($items_list->GetSelectSQL(true, false));
-		$options['ForceSelectSQL'] = $items_list->GetSelectSQL();
-
-		$event->setEventParam('options', $options);
-
+		/** @var kDBItem $object */
 		$object = $this->Application->recallObject($event->Prefix . '.export');
-		/* @var $object kDBItem */
 
 		$object->SetField('Number', 999999);
 		$object->SetField('SubNumber', 999);