From 105b0705b13f149765127011a681dd744f8be207 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 18 Nov 2021 14:37:23 -0700
Subject: [PATCH] - Fix duplicated row from template above nextmatch - Fix
 favorite in wrong place

---
 api/js/etemplate/et2_extension_nextmatch.ts | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index 5fe6a5a62c..4d9b245218 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -1759,17 +1759,9 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 			{
 				continue;
 			}
-			if(typeof _row[x] != "undefined" && _row[x].widget)
-			{
-				columnWidgets[x] = _row[x].widget;
 
-				// Append the widget to this container
-				this.addChild(_row[x].widget);
-			}
-			else
-			{
-				columnWidgets[x] = _row[x].widget;
-			}
+			columnWidgets[x] = _row[x].widget;
+
 			// Pass along column alignment
 			if(_row[x].align && columnWidgets[x])
 			{
@@ -3852,6 +3844,10 @@ export class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INext
 		{
 			return this.search_box[0];
 		}
+		if(_sender == this.favorites)
+		{
+			return egwIsMobile() ? this.search_box.find('.nm_favorites_div').show() : this.right_div;
+		}
 		if(_sender.id == 'export')
 		{
 			return this.right_div[0];
@@ -3870,9 +3866,9 @@ export class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INext
 
 		for(let header of this.headers)
 		{
-			if(header && header.getDOMNode && header.getDOMNode(this))
+			if(header && header.getDOMNode && header.getDOMNode(_sender))
 			{
-				return header.getDOMNode(this);
+				return header.getDOMNode(_sender);
 			}
 		}
 		return null;