Index: branches/5.3.x/core/admin_templates/incs/menu_blocks.tpl
===================================================================
diff -u -N -r15483 -r15902
--- branches/5.3.x/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 15483)
+++ branches/5.3.x/core/admin_templates/incs/menu_blocks.tpl	(.../menu_blocks.tpl)	(revision 15902)
@@ -3,7 +3,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="nlsmenu_filter_block">
-	$Menus['<inp2:m_Param name="menu_name"/>'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filter.<inp2:m_param name="label" escape="1"/>', true), '<inp2:m_param name="label" html_escape="1"/>', 'javascript:<inp2:m_param name="filter_action" js_escape="1"/>',<inp2:m_param name="filter_status"/>);
+	$Menus['<inp2:m_Param name="menu_name"/>'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filter.<inp2:m_param name="label" js_escape="1"/>', true), '<inp2:m_Phrase name="$label" escape="1"/>', 'javascript:<inp2:m_param name="filter_action" js_escape="1"/>',<inp2:m_param name="filter_status"/>);
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="nlsmenu_auto_refresh_element">
@@ -39,7 +39,7 @@
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_filter_menu'].addSeparator();
 			<inp2:{$PrefixSpecial}_DrawFilterMenu item_block="nlsmenu_filter_block" spearator_block="nlsmenu_filter_separator" menu_name="{$PrefixSpecial}_filter_menu" ajax="$ajax"/>
 		</inp2:m_if>
-		
+
 		<inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes">
 			// per page menu
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_perpage_menu'] = menuMgr.createMenu(rs('<inp2:m_param name="PrefixSpecial"/>.perpage.menu'));
@@ -59,7 +59,7 @@
 		$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].showIcon = true;
 
 		<inp2:m_if check="m_ParamEquals" name="menu_columns" value="yes">
-			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.columns'),'<inp2:m_Phrase label="la_SelectColumns" html_escape="1" js_escape="1"/>','javascript:openSelector("<inp2:m_param name="PrefixSpecial"/>", "<inp2:m_Link template="popups/column_picker" grid_name="$grid" no_amp="1"/>")');			
+			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.columns'),'<inp2:m_Phrase label="la_SelectColumns" html_escape="1" js_escape="1"/>','javascript:openSelector("<inp2:m_param name="PrefixSpecial"/>", "<inp2:m_Link template="popups/column_picker" grid_name="$grid" no_amp="1"/>")');
 		</inp2:m_if>
 
 		<inp2:m_if check="m_ParamEquals" name="menu_auto_refresh" value="yes">
@@ -69,11 +69,11 @@
 		<inp2:m_if check="m_ParamEquals" name="menu_filters" value="yes">
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.filters'), '<inp2:m_phrase name="la_Text_View" html_escape="1" js_escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.filter.menu'), null);
 		</inp2:m_if>
-		
+
 		<inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes">
 			$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.perpage'), '<inp2:m_phrase name="la_prompt_PerPage" html_escape="1" js_escape="1"/>', 'javascript:void()', null, true, null, rs('<inp2:m_param name="PrefixSpecial"/>.perpage.menu'), null);
 		</inp2:m_if>
-		
+
 		$MenuNames['<inp2:m_param name="PrefixSpecial"/>'+'_view_menu'] = '<inp2:{$PrefixSpecial}_GetItemName js_escape="1"/>';
 
 		Application.processHooks('<inp2:m_param name="PrefixSpecial"/>:OnCreateViewMenu');