diff --git a/sources/Subs.php b/sources/Subs.php
index 34296c1a79..b6484d3793 100644
--- a/sources/Subs.php
+++ b/sources/Subs.php
@@ -3834,6 +3834,10 @@ function setupMenuContext()
 	if (isset($context['menu_buttons'][$current_action]))
 		$context['menu_buttons'][$current_action]['active_button'] = true;
 
+	// No need for accurate text if we are in xml mode
+	if (isset($_REQUEST['xml']))
+		return;
+
 	// Update the PM menu item if they have unread messages
 	if (!$user_info['is_guest'] && $context['user']['unread_messages'] > 0 && isset($context['menu_buttons']['pm']))
 	{
diff --git a/sources/controllers/Suggest.controller.php b/sources/controllers/Suggest.controller.php
index 1d5ae3322c..a7f04e3b46 100644
--- a/sources/controllers/Suggest.controller.php
+++ b/sources/controllers/Suggest.controller.php
@@ -56,7 +56,7 @@ function action_suggest($checkRegistered = null)
 		{
 			$function = 'action_suggest_' . $searchTypes[$_REQUEST['suggest_type']];
 			$context['sub_template'] = 'generic_xml';
-			$context['xml_data'] = $function();
+			$context['xml_data'] = $this->$function();
 		}
 	}