Index: branches/5.2.x/admin_templates/reports/results.tpl
===================================================================
diff -u -N -r16341 -r16696
--- branches/5.2.x/admin_templates/reports/results.tpl	(.../results.tpl)	(revision 16341)
+++ branches/5.2.x/admin_templates/reports/results.tpl	(.../results.tpl)	(revision 16696)
@@ -1,6 +1,10 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" pagination="1" title_preset="report_results"/>
 
+<inp2:rep.metric_SyncIDFieldDeclaration/>
+<inp2:rep.metric_ReportOptionValue name="grid" result_to_var="grid"/>
+
+<inp2:m_RenderElement name="combined_header" prefix="rep" section="in-commerce:reports" grid="$grid" pagination="1" title_preset="report_results"/>
+
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%">
 <tbody>
@@ -34,6 +38,9 @@
 
 				 a_toolbar.AddButton( new ToolBarButton('export', '<inp2:m_phrase label="la_ToolTip_Export" escape="1"/>', function() {
 								submit_event('rep','OnExportReport');
+
+								set_hidden_field('events[rep]', null);
+								submitted = false;
 							}
 					) );
 
@@ -55,14 +62,16 @@
 			</script>
 		</td>
 
-	  	<inp2:m_RenderElement name="search_main_toolbar" prefix="rep" grid="Default"/>
+	  	<inp2:m_RenderElement name="search_main_toolbar" prefix="rep" grid="$grid"/>
 	</tr>
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="rep" IdField="CategoryId" grid="Default" totals_render_as="grid_total_row"/>
+<inp2:rep.metric_ReportOptionValue name="id_field" result_to_var="id_field"/>
+
+<inp2:m_RenderElement name="grid" PrefixSpecial="rep" IdField="$id_field" grid="$grid" totals_render_as="grid_total_row"/>
 <script type="text/javascript">
 	Grids['rep'].SetDependantToolbarButtons( new Array() );
 </script>
 
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>