diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index 050115148f6ba..73ebd92d99d00 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -25,6 +25,13 @@
 				edit="true"
 				clear="true"
 			/>
+			<field
+				name="filter_tag"
+				type="tag"
+				label="JTAG"
+				description="JTAG_FIELD_SELECT_DESC"
+				multiple="true"
+			/>
 		</fieldset>
 	</fields>
 
@@ -32,8 +39,8 @@
 	<fields name="params">
 		<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
 
-			<field 
-				name="show_category_title" 
+			<field
+				name="show_category_title"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				useglobal="true"
@@ -43,8 +50,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_description" 
+			<field
+				name="show_description"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -54,8 +61,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_description_image" 
+			<field
+				name="show_description_image"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
 				useglobal="true"
@@ -65,8 +72,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="maxLevel" 
+			<field
+				name="maxLevel"
 				type="list"
 				label="JGLOBAL_MAXLEVEL_LABEL"
 				useglobal="true"
@@ -80,8 +87,8 @@
 				<option value="5">J5</option>
 			</field>
 
-			<field 
-				name="show_empty_categories" 
+			<field
+				name="show_empty_categories"
 				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				useglobal="true"
@@ -91,8 +98,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_no_articles" 
+			<field
+				name="show_no_articles"
 				type="list"
 				label="COM_CONTENT_NO_ARTICLES_LABEL"
 				useglobal="true"
@@ -102,7 +109,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="show_category_heading_title_text"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
@@ -113,8 +120,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_subcat_desc" 
+			<field
+				name="show_subcat_desc"
 				type="list"
 				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
 				useglobal="true"
@@ -124,8 +131,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_cat_num_articles" 
+			<field
+				name="show_cat_num_articles"
 				type="list"
 				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
 				useglobal="true"
@@ -135,8 +142,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_cat_tags" 
+			<field
+				name="show_cat_tags"
 				type="list"
 				label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL"
 				useglobal="true"
@@ -146,8 +153,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="page_subheading" 
+			<field
+				name="page_subheading"
 				type="text"
 				label="JGLOBAL_SUBHEADING_LABEL"
 				size="20"
@@ -156,8 +163,8 @@
 		</fieldset>
 
 		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
-			<field 
-				name="show_pagination_limit" 
+			<field
+				name="show_pagination_limit"
 				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				useglobal="true"
@@ -167,8 +174,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="filter_field" 
+			<field
+				name="filter_field"
 				type="list"
 				label="JGLOBAL_FILTER_FIELD_LABEL"
 				useglobal="true"
@@ -181,8 +188,8 @@
 	 			<option value="month">JMONTH_PUBLISHED</option>
 			</field>
 
-			<field 
-				name="show_headings" 
+			<field
+				name="show_headings"
 				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
 				useglobal="true"
@@ -192,8 +199,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="list_show_date" 
+			<field
+				name="list_show_date"
 				type="list"
 				label="JGLOBAL_SHOW_DATE_LABEL"
 				useglobal="true"
@@ -204,8 +211,8 @@
 				<option value="published">JPUBLISHED</option>
 			</field>
 
-			<field 
-				name="date_format" 
+			<field
+				name="date_format"
 				type="text"
 				label="JGLOBAL_DATE_FORMAT_LABEL"
 				description="JGLOBAL_DATE_FORMAT_DESC"
@@ -213,8 +220,8 @@
 				useglobal="true"
 			/>
 
-			<field 
-				name="list_show_hits" 
+			<field
+				name="list_show_hits"
 				type="list"
 				label="JGLOBAL_LIST_HITS_LABEL"
 				useglobal="true"
@@ -224,8 +231,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="list_show_author" 
+			<field
+				name="list_show_author"
 				type="list"
 				label="JGLOBAL_LIST_AUTHOR_LABEL"
 				useglobal="true"
@@ -235,7 +242,7 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="list_show_votes"
 				type="list"
 				label="JGLOBAL_LIST_VOTES_LABEL"
@@ -246,7 +253,7 @@
 				<option value="1" requires="vote">JSHOW</option>
 			</field>
 
-			<field 
+			<field
 				name="list_show_ratings"
 				type="list"
 				label="JGLOBAL_LIST_RATINGS_LABEL"
@@ -263,8 +270,8 @@
 				hr="true"
 			/>
 
-			<field 
-				name="orderby_pri" 
+			<field
+				name="orderby_pri"
 				type="list"
 				label="JGLOBAL_CATEGORY_ORDER_LABEL"
 				useglobal="true"
@@ -275,8 +282,8 @@
 				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
 			</field>
 
-			<field 
-				name="orderby_sec" 
+			<field
+				name="orderby_sec"
 				type="list"
 				label="JGLOBAL_ARTICLE_ORDER_LABEL"
 				useglobal="true"
@@ -299,8 +306,8 @@
 				<option value="rrank" requires="vote">JGLOBAL_RATINGS_ASC</option>
 			</field>
 
-			<field 
-				name="order_date" 
+			<field
+				name="order_date"
 				type="list"
 				label="JGLOBAL_ORDERING_DATE_LABEL"
 				useglobal="true"
@@ -310,8 +317,8 @@
 				<option value="published">JPUBLISHED</option>
 			</field>
 
-			<field 
-				name="show_pagination" 
+			<field
+				name="show_pagination"
 				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
 				useglobal="true"
@@ -322,8 +329,8 @@
 				<option value="2">JGLOBAL_AUTO</option>
 			</field>
 
-			<field 
-				name="show_pagination_results" 
+			<field
+				name="show_pagination_results"
 				type="list"
 				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
 				useglobal="true"
@@ -333,8 +340,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="display_num" 
+			<field
+				name="display_num"
 				type="list"
 				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
 				default="10"
@@ -350,9 +357,9 @@
 				<option value="0">JALL</option>
 			</field>
 
-			<field 
-				name="show_featured" 
-				type="list" 
+			<field
+				name="show_featured"
+				type="list"
 				label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL"
 				useglobal="true"
 				default=""
@@ -378,8 +385,8 @@
 				view="article"
 			/>
 
-			<field 
-				name="show_title" 
+			<field
+				name="show_title"
 				type="list"
 				label="JGLOBAL_SHOW_TITLE_LABEL"
 				useglobal="true"
@@ -389,8 +396,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="link_titles" 
+			<field
+				name="link_titles"
 				type="list"
 				label="JGLOBAL_LINKED_TITLES_LABEL"
 				useglobal="true"
@@ -400,8 +407,8 @@
 				<option value="1">JYES</option>
 			</field>
 
-			<field 
-				name="show_intro" 
+			<field
+				name="show_intro"
 				type="list"
 				label="JGLOBAL_SHOW_INTRO_LABEL"
 				useglobal="true"
@@ -411,8 +418,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_category" 
+			<field
+				name="show_category"
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				useglobal="true"
@@ -422,19 +429,19 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="link_category" 
+			<field
+				name="link_category"
 				type="list"
 				label="JGLOBAL_LINK_CATEGORY_LABEL"
 				useglobal="true"
-				class="chzn-color"				
+				class="chzn-color"
 				>
 				<option value="0">JNO</option>
 				<option value="1">JYES</option>
 			</field>
 
-			<field 
-				name="show_parent_category" 
+			<field
+				name="show_parent_category"
 				type="list"
 				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
 				useglobal="true"
@@ -444,8 +451,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="link_parent_category" 
+			<field
+				name="link_parent_category"
 				type="list"
 				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
 				useglobal="true"
@@ -466,8 +473,8 @@
 				<option value="0">JHIDE</option>
 			</field>
 
-			<field 
-				name="show_author" 
+			<field
+				name="show_author"
 				type="list"
 				label="JGLOBAL_SHOW_AUTHOR_LABEL"
 				useglobal="true"
@@ -477,8 +484,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="link_author" 
+			<field
+				name="link_author"
 				type="list"
 				label="JGLOBAL_LINK_AUTHOR_LABEL"
 				useglobal="true"
@@ -488,8 +495,8 @@
 				<option value="1">JYES</option>
 			</field>
 
-			<field 
-				name="show_create_date" 
+			<field
+				name="show_create_date"
 				type="list"
 				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
 				useglobal="true"
@@ -499,8 +506,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_modify_date" 
+			<field
+				name="show_modify_date"
 				type="list"
 				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
 				useglobal="true"
@@ -510,8 +517,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_publish_date" 
+			<field
+				name="show_publish_date"
 				type="list"
 				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
 				useglobal="true"
@@ -521,8 +528,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_item_navigation" 
+			<field
+				name="show_item_navigation"
 				type="list"
 				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
 				useglobal="true"
@@ -533,7 +540,7 @@
 			</field>
 
 			<field
-				name="show_vote" 
+				name="show_vote"
 				type="list"
 				label="JGLOBAL_SHOW_VOTE_LABEL"
 				useglobal="true"
@@ -577,8 +584,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="show_noauth" 
+			<field
+				name="show_noauth"
 				type="list"
 				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
 				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
@@ -591,8 +598,8 @@
 		</fieldset>
 		<fieldset name="integration" label="COM_MENUS_INTEGRATION_FIELDSET_LABEL">
 
-			<field 
-				name="show_feed_link" 
+			<field
+				name="show_feed_link"
 				type="list"
 				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
 				useglobal="true"
@@ -602,8 +609,8 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field 
-				name="feed_summary" 
+			<field
+				name="feed_summary"
 				type="list"
 				label="JGLOBAL_FEED_SUMMARY_LABEL"
 				useglobal="true"
diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
index d27b8a610ae4e..066bc8c5f56c3 100644
--- a/libraries/src/Form/Field/TagField.php
+++ b/libraries/src/Form/Field/TagField.php
@@ -170,7 +170,7 @@ protected function getOptions()
 		$query->where($db->quoteName('a.lft') . ' > 0');
 
 		// Preload only active values, everything else will be searched via AJAX
-		if ($this->isRemoteSearch() && $this->value)
+		if ($this->isRemoteSearch() && (is_array($this->value) && !empty($this->value[0])))
 		{
 			$query->where('a.id IN (' . implode(',', $this->value) . ')');
 		}
@@ -203,7 +203,7 @@ protected function getOptions()
 		// Block the possibility to set a tag as it own parent
 		if ($this->form->getName() === 'com_tags.tag')
 		{
-			$id   = (int) $this->form->getValue('id', 0);
+			$id = (int) $this->form->getValue('id', 0);
 
 			foreach ($options as $option)
 			{
@@ -245,7 +245,7 @@ protected function prepareOptionsNested(&$options)
 		{
 			foreach ($options as &$option)
 			{
-				$repeat = (isset($option->level) && $option->level - 1 >= 0) ? $option->level - 1 : 0;
+				$repeat       = (isset($option->level) && $option->level - 1 >= 0) ? $option->level - 1 : 0;
 				$option->text = str_repeat('- ', $repeat) . $option->text;
 			}
 		}