diff --git a/addressbook/js/app.js b/addressbook/js/app.js
index dbe859e9e0..cd5d244975 100644
--- a/addressbook/js/app.js
+++ b/addressbook/js/app.js
@@ -51,7 +51,7 @@ app.classes.addressbook = AppJS.extend(
 		// r49769 let's CRM view run under currentapp == "addressbook", which causes
 		// app.addressbook.et2_ready called before app.infolog.et2_ready and therefore
 		// app.addressbook.et2 would point to infolog template, if we not stop here
-		if (name.match(/^infolog\./)) return;
+		if (name.match(/^infolog|tracker\./)) return;
 
 		// call parent
 		this._super.apply(this, arguments);
diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index 2dd3d72e8f..87ebb28192 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -659,17 +659,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
 				{
 					foreach($row as &$options)
 					{
-						foreach($options as &$label)
-						{
-							if(!is_array($label))
-							{
-								$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
-							}
-							else if ($label['label'])
-							{
-								$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
-							}
-						}
+						etemplate_widget_menupopup::fix_encoded_options($options, true);
 					}
 				}
 				$rows[$n] = $row;