diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php
index aa50b81bb7a63..4242d710d3522 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -75,6 +75,7 @@
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
+		<?php $this->ignore_fieldsets = array('jmetadata'); ?>
 		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
 
 		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php
index cd86aa6efd87f..10555fb143918 100644
--- a/administrator/components/com_contact/views/contact/tmpl/edit.php
+++ b/administrator/components/com_contact/views/contact/tmpl/edit.php
@@ -15,6 +15,9 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('details', 'item_associations', 'jmetadata');
+
 $app = JFactory::getApplication();
 $assoc = JLanguageAssociations::isEnabled();
 ?>
diff --git a/administrator/components/com_contact/views/contact/tmpl/modal.php b/administrator/components/com_contact/views/contact/tmpl/modal.php
index 8ad81a0300089..cb8ea7d41d308 100644
--- a/administrator/components/com_contact/views/contact/tmpl/modal.php
+++ b/administrator/components/com_contact/views/contact/tmpl/modal.php
@@ -15,6 +15,9 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('details', 'display', 'email');
+
 $app = JFactory::getApplication();
 
 $input = $app->input;
diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php
index 318b7a56bbabf..a7e7556460a23 100644
--- a/administrator/components/com_content/views/article/tmpl/edit.php
+++ b/administrator/components/com_content/views/article/tmpl/edit.php
@@ -16,10 +16,9 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('formbehavior.chosen', 'select');
 
-$this->hiddenFieldsets = array();
-$this->hiddenFieldsets[0] = 'basic-limited';
-$this->configFieldsets = array();
-$this->configFieldsets[0] = 'editorConfig';
+$this->configFieldsets  = array('editorConfig');
+$this->hiddenFieldsets  = array('basic-limited');
+$this->ignore_fieldsets = array('jmetadata');
 
 // Create shortcut to parameters.
 $params = $this->state->get('params');
diff --git a/administrator/components/com_content/views/article/tmpl/modal.php b/administrator/components/com_content/views/article/tmpl/modal.php
index c8f204ad06b4f..c593d0c956847 100644
--- a/administrator/components/com_content/views/article/tmpl/modal.php
+++ b/administrator/components/com_content/views/article/tmpl/modal.php
@@ -17,10 +17,9 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('formbehavior.chosen', 'select');
 
-$this->hiddenFieldsets = array();
-$this->hiddenFieldsets[0] = 'basic-limited';
-$this->configFieldsets = array();
-$this->configFieldsets[0] = 'editorConfig';
+$this->configFieldsets  = array('editorConfig');
+$this->hiddenFieldsets  = array('basic-limited');
+$this->ignore_fieldsets = array('jmetadata');
 
 // Create shortcut to parameters.
 $params = $this->state->get('params');
diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php
index 2789dd0e762f6..10231d0c1c051 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit.php
@@ -154,7 +154,7 @@
 
 		<?php
 		$this->fieldsets = array();
-		$this->ignore_fieldsets = array('aliasoptions', 'request');
+		$this->ignore_fieldsets = array('item_associations');
 		echo JLayoutHelper::render('joomla.edit.params', $this);
 		?>
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
index 8795afd6ed445..250758f282941 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
@@ -77,7 +77,7 @@
 		<?php echo $this->loadTemplate('display'); ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-		<?php $this->set('ignore_fieldsets', array('jbasic')); ?>
+		<?php $this->ignore_fieldsets = array('images', 'jbasic', 'jmetadata'); ?>
 		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
 
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
index a1fcd2ff421db..453bd7e2750d7 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
@@ -92,7 +92,7 @@
 		<?php echo $this->loadTemplate('display'); ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-		<?php $this->set('ignore_fieldsets', array('jbasic')); ?>
+		<?php $this->ignore_fieldsets = array('jbasic'); ?>
 		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
 
 		<?php if ($assoc) : ?>
diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php
index a97c777be6165..74af88b09a487 100644
--- a/administrator/components/com_tags/views/tag/tmpl/edit.php
+++ b/administrator/components/com_tags/views/tag/tmpl/edit.php
@@ -62,6 +62,7 @@
 		</div>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+		<?php $this->ignore_fieldsets = array('jmetadata'); ?>
 		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
 
 	</div>
diff --git a/administrator/components/com_weblinks/views/weblink/tmpl/edit.php b/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
index 64ca6f03eb26f..9e968f0392da3 100644
--- a/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
+++ b/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
@@ -14,6 +14,8 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 
+// Fieldsets to not automatically render by /layouts/joomla/edit/params.php
+$this->ignore_fieldsets = array('images', 'jmetadata');
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index 3626560046895..0e706695a8eb1 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -9,35 +9,29 @@
 
 defined('_JEXEC') or die;
 
-$app = JFactory::getApplication();
-$form = $displayData->getForm();
-
-$fieldSets = $form->getFieldsets('params');
-
-// For BC with versions < 3.2 we need to render the attribs too
-$attribsFieldSet = $form->getFieldsets('attribs');
-
-$fieldSets = array_merge($fieldSets, $attribsFieldSet);
+$app       = JFactory::getApplication();
+$form      = $displayData->getForm();
+$fieldSets = $form->getFieldsets();
 
 if (empty($fieldSets))
 {
 	return;
 }
 
-$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: array();
-$ignoreFields = $displayData->get('ignore_fields') ?: array();
-$extraFields = $displayData->get('extra_fields') ?: array();
+$ignoreFieldsets = $displayData->get('ignore_fieldsets') ? : array();
+$ignoreFields    = $displayData->get('ignore_fields') ? : array();
+$extraFields     = $displayData->get('extra_fields') ? : array();
 
 if (!empty($displayData->hiddenFieldsets))
 {
 	// These are required to preserve data on save when fields are not displayed.
-	$hiddenFieldsets = $displayData->hiddenFieldsets ?: array();
+	$hiddenFieldsets = $displayData->hiddenFieldsets ? : array();
 }
 
 if (!empty($displayData->configFieldsets))
 {
 	// These are required to configure showing and hiding fields in the editor.
-	$configFieldsets = $displayData->configFieldsets ?: array();
+	$configFieldsets = $displayData->configFieldsets ? : array();
 }
 
 if ($displayData->get('show_options', 1))
@@ -46,8 +40,9 @@
 	{
 		// Ensure any fieldsets we don't want to show are skipped (including repeating formfield fieldsets)
 		if (in_array($name, $ignoreFieldsets) || (!empty($configFieldsets) && in_array($name, $configFieldsets))
-				|| !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets)
-				|| (isset($fieldSet->repeat) && $fieldSet->repeat == true))
+			|| !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets)
+			|| (isset($fieldSet->repeat) && $fieldSet->repeat == true)
+		)
 		{
 			continue;
 		}
@@ -81,7 +76,7 @@
 }
 else
 {
-	$html = array();
+	$html   = array();
 	$html[] = '<div style="display:none;">';
 	foreach ($fieldSets as $name => $fieldSet)
 	{