From 8e79417664eb3a9f5b000faa2a4c3bc286f2c89e Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 16 May 2019 00:50:45 +0200
Subject: [PATCH 01/26] Added create new custom code to all fields that have
 string lenght.

---
 README.md                                    |  2 +-
 admin/README.txt                             |  2 +-
 admin/helpers/compiler/a_Get.php             |  2 +-
 admin/models/ajax.php                        | 69 ++++++++++++--------
 admin/models/forms/admin_fields_relations.js |  2 +-
 admin/models/forms/admin_view.js             |  2 +-
 admin/models/forms/component_dashboard.js    |  2 +-
 admin/models/forms/custom_admin_view.js      |  2 +-
 admin/models/forms/custom_code.js            |  2 +-
 admin/models/forms/dynamic_get.js            |  2 +-
 admin/models/forms/field.js                  |  2 +-
 admin/models/forms/fieldtype.js              |  2 +-
 admin/models/forms/joomla_component.js       |  2 +-
 admin/models/forms/layout.js                 |  2 +-
 admin/models/forms/library.js                |  2 +-
 admin/models/forms/site_view.js              |  2 +-
 admin/models/forms/template.js               |  2 +-
 admin/models/forms/validation_rule.js        |  2 +-
 18 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 7628886d5..3da9b4583 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206359**
++ *Line count*: **206374**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 7628886d5..3da9b4583 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206359**
++ *Line count*: **206374**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 5e90575d7..50adbd094 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Get
 {
-	
+
 	/**
 	 * The hash placeholder
 	 * 
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 6c09e19d2..77128b307 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -315,6 +315,7 @@ class ComponentbuilderModelAjax extends JModelList
 		'component_config' => 'components_config',
 		'component_dashboard' => 'components_dashboard',
 		'component_files_folders' => 'components_files_folders',
+		'custom_code' => 'custom_codes',
 		'language' => true);
 
 	public function getButton($type, $size)
@@ -341,11 +342,16 @@ class ComponentbuilderModelAjax extends JModelList
 					$ref = '&amp;ref=' . $values['a_view'] . '&amp;refid=' . $values['a_id'] . '&amp;return=' . urlencode(base64_encode($return_url));
 				}
 				// build url (A tag)
-				$startAtag = '<a class="btn btn-success vdm-button-new" onclick="UIkit2.modal.confirm(\''.JText::_('COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE').'\', function(){ window.location.href = \'index.php?option=com_componentbuilder&amp;view=' . $type . '&amp;layout=edit' . $ref . '\' })" href="javascript:void(0)"  title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', ComponentbuilderHelper::safeString($type, 'W')).'">';
-				// build the smaller button
-				if (2 == $size)
+				$startAtag = 'onclick="UIkit2.modal.confirm(\''.JText::_('COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE').'\', function(){ window.location.href = \'index.php?option=com_componentbuilder&amp;view=' . $type . '&amp;layout=edit' . $ref . '\' })" href="javascript:void(0)"  title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', ComponentbuilderHelper::safeString($type, 'W')).'">';
+				// build the smallest button
+				if (3 == $size)
 				{
-					$button = $startAtag.'<span class="icon-new icon-white"></span> ' . JText::_('COM_COMPONENTBUILDER_CREATE') . '</a>';
+					$button = '<a class="btn btn-small btn-success" style="margin: 0 0 5px 0;" ' . $startAtag.'<span class="icon-new icon-white"></span></a>';
+				}
+				// build the smaller button
+				elseif (2 == $size)
+				{
+					$button = '<a class="btn btn-success vdm-button-new" ' . $startAtag . '<span class="icon-new icon-white"></span> ' . JText::_('COM_COMPONENTBUILDER_CREATE') . '</a>';
 				}
 				else
 				// build the big button
@@ -354,7 +360,7 @@ class ComponentbuilderModelAjax extends JModelList
 								<div class="control-label">
 									<label>' . ucwords($type) . '</label>
 								</div>
-								<div class="controls">	'.$startAtag.'
+								<div class="controls"><a class="btn btn-success vdm-button-new" ' . $startAtag . '
 									<span class="icon-new icon-white"></span> 
 										' . JText::_('COM_COMPONENTBUILDER_NEW') . '
 									</a>
@@ -1934,6 +1940,23 @@ class ComponentbuilderModelAjax extends JModelList
 		// only continue if this is a legitimate call
 		if (isset($view['a_id']) && $view['a_id'] == $id && isset($view['a_view']) && ($target = $this->getCodeSearchKeys($view['a_view'], 'query_')) !== false)
 		{
+			// reset the buttons bucket
+			$buttons = array();
+			// some helper for some fields
+			$helper = array('xml' => 'note_select_field_type');
+			// get input
+			$jinput = JFactory::getApplication()->input;
+			$return_here = $jinput->get('return_here', null, 'base64');
+			// set the return here value if not found
+			if (ComponentbuilderHelper::checkString($return_here))
+			{
+				$return_here =  '&return=' . $return_here;
+			}
+			else
+			{
+				$return_here =  '&ref=' . $view['a_view'] . '&refid=' . (int) $id;
+			}
+			// start db query
 			$db = JFactory::getDbo();
 			$query = $db->getQuery(true)
 				->select($db->quoteName($target['select']))
@@ -1944,8 +1967,6 @@ class ComponentbuilderModelAjax extends JModelList
 			if ($db->loadRowList())
 			{
 				$data = $db->loadAssoc();
-				// some helper for some fields
-				$helper = array('xml' => 'note_select_field_type');
 				// reset the bucket
 				$bucket = array();
 				foreach ($data as $key => $value)
@@ -1973,25 +1994,20 @@ class ComponentbuilderModelAjax extends JModelList
 							// get all custom codes in value
 							$bucket[$key] = ComponentbuilderHelper::getAllBetween($value, '[CUSTOMC' . 'ODE=', ']');
 						}
+						// check if field has string length
+						if (ComponentbuilderHelper::checkString($value))
+						{
+							$buttons[$key] = array();
+							if (($button = $this->getButton('custom_code', 3)) && ComponentbuilderHelper::checkString($button))
+							{
+								$buttons[$key]['_create'] = $button;
+							}
+						}
 					}
 				}
 				// check if any values found
 				if (ComponentbuilderHelper::checkArray($bucket))
 				{
-					// get input
-					$jinput = JFactory::getApplication()->input;
-					$return_here = $jinput->get('return_here', null, 'base64');
-					// set the return here value if not found
-					if (ComponentbuilderHelper::checkString($return_here))
-					{
-						$return_here =  '&return=' . $return_here;
-					}
-					else
-					{
-						$return_here =  '&ref=' . $view['a_view'] . '&refid=' . (int) $id;
-					}
-					// reset the buttons bucket
-					$buttons = array();
 					foreach ($bucket as $field => $customcodes)
 					{
 						$edit_icon = '<span class="icon-edit" aria-hidden="true"></span> ';
@@ -2000,7 +2016,6 @@ class ComponentbuilderModelAjax extends JModelList
 						{
 							$field = $helper[$field];
 						}
-						$buttons[$field] = array();
 						foreach ($customcodes as $customcode)
 						{
 							$key = (array) explode('+', $customcode);
@@ -2012,13 +2027,13 @@ class ComponentbuilderModelAjax extends JModelList
 							}
 						}
 					}
-					// only continue if we have buttons in array
-					if (ComponentbuilderHelper::checkArray($buttons, true))
-					{
-						return $buttons;
-					}
 				}
 			}
+			// only continue if we have buttons in array
+			if (ComponentbuilderHelper::checkArray($buttons, true))
+			{
+				return $buttons;
+			}
 		}
 		return false;
 	}
diff --git a/admin/models/forms/admin_fields_relations.js b/admin/models/forms/admin_fields_relations.js
index 2e5e265c6..dd027678a 100644
--- a/admin/models/forms/admin_fields_relations.js
+++ b/admin/models/forms/admin_fields_relations.js
@@ -93,7 +93,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index e08365bb0..8e894c1c6 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -1507,7 +1507,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/component_dashboard.js b/admin/models/forms/component_dashboard.js
index ed2e6521b..70dd5c103 100644
--- a/admin/models/forms/component_dashboard.js
+++ b/admin/models/forms/component_dashboard.js
@@ -37,7 +37,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js
index 664b3240a..9f7e4b7ec 100644
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@@ -686,7 +686,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index 3de69a3a7..d2e0dfb44 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -377,7 +377,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index 33da3c9f4..70cf89b22 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -1744,7 +1744,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index 03abec751..01ea9b93b 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -873,7 +873,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js
index 927afbd1a..317cf5c28 100644
--- a/admin/models/forms/fieldtype.js
+++ b/admin/models/forms/fieldtype.js
@@ -829,7 +829,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js
index e0b813187..b8537ce62 100644
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@@ -1184,7 +1184,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js
index 2a0fbe32d..96f1224c5 100644
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@@ -113,7 +113,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js
index 148612aed..c4bd265e8 100644
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@@ -491,7 +491,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js
index 9d7b8b3f7..927686d42 100644
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@@ -727,7 +727,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js
index dad4fdef6..595af1b84 100644
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@@ -113,7 +113,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
diff --git a/admin/models/forms/validation_rule.js b/admin/models/forms/validation_rule.js
index 8e28efbc4..992c3fdc9 100644
--- a/admin/models/forms/validation_rule.js
+++ b/admin/models/forms/validation_rule.js
@@ -117,7 +117,7 @@ function getEditCustomCodeButtons(){
 	getEditCustomCodeButtons_server(id).done(function(result) {
 		if(isObject(result)){
 			jQuery.each(result, function( field, buttons ) {
-				jQuery('<div class="control-group"><div class="control-label"><label>Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
+				jQuery('<div class="control-group"><div class="control-label"><label>Add/Edit Customcode</label></div><div class="controls control-customcode-buttons-'+field+'"></div></div>').insertBefore(".control-wrapper-"+ field);
 				jQuery.each(buttons, function( name, button ) {
 					jQuery(".control-customcode-buttons-"+field).append(button);
 				});
-- 
2.40.1


From 42d5b3b55c7a3974d9cafbafd486b3a7e5c44ded Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 16 May 2019 01:07:38 +0200
Subject: [PATCH 02/26] Added the feature that loads the company global values
 when creating a new component, if they are set.

---
 README.md                         |  2 +-
 admin/README.txt                  |  2 +-
 admin/models/joomla_component.php | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3da9b4583..9c6490ec9 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206374**
++ *Line count*: **206387**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 3da9b4583..9c6490ec9 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206374**
++ *Line count*: **206387**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 5900dd346..e79d0f450 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -407,7 +407,20 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$form->setFieldAttribute($name, 'editor', $global_editor . '|none');
 			}
 		}
-
+
+		// Only load these values if no id is found
+		if (0 == $id)
+		{
+			// get components global params
+			$params = JComponentHelper::getParams('com_componentbuilder');
+			// set company defaults
+			$form->setValue('companyname', null, $params->get('export_company', ''));
+			$form->setValue('author', null, $params->get('export_owner', ''));
+			$form->setValue('email', null, $params->get('export_email', ''));
+			$form->setValue('website', null, $params->get('export_website', ''));
+			$form->setValue('copyright', null, $params->get('export_copyright', 'Copyright (C) 2015. All Rights Reserved'));
+			$form->setValue('license', null, $params->get('export_license', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html'));
+		}
 		return $form;
 	}
 
-- 
2.40.1


From d3f623d184c4f2b8314d90e5427c8633a4b0bd80 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 17 May 2019 00:43:24 +0200
Subject: [PATCH 03/26] Improved on the mysql default selected values to use
 InnoDB, utf8mb4, utf8mb4_general_ci

---
 README.md                                        |  4 ++--
 admin/README.txt                                 |  4 ++--
 .../en-GB/en-GB.com_componentbuilder.ini         |  4 +---
 admin/models/admin_view.php                      | 16 ++++++++++++++++
 admin/models/forms/admin_view.xml                | 16 +++++-----------
 admin/models/joomla_component.php                | 14 ++++++--------
 componentbuilder.xml                             |  2 +-
 7 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 9c6490ec9..19e759ab3 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 15th May, 2019
++ *Last Build*: 16th May, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206387**
++ *Line count*: **206393**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 9c6490ec9..19e759ab3 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 15th May, 2019
++ *Last Build*: 16th May, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206387**
++ *Line count*: **206393**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 980a285a3..a07e188dc 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -746,9 +746,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_GENERIC="Generic"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_BIN_CHARSET_GEOSTDEIGHT="geostd8_bin (charset = geostd8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GENERAL_CI_CHARSET_GEOSTDEIGHT="geostd8_general_ci (charset = geostd8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GEOSTDEIGHT_GEORGIAN_MOST_SUITABLE_COLLATION_GEOSTDEIGHT_GENERAL_CI="geostd8 - GEOSTD8 Georgian (most suitable collation = geostd8_general_ci)"
-COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_MYISAM="Global (default = MyISAM)"
-COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT="Global (default = utf8)"
-COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT_GENERAL_CI="Global (default = utf8_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_BIN_CHARSET_GREEK="greek_bin (charset = greek)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_GENERAL_CI_CHARSET_GREEK="greek_general_ci (charset = greek)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINESEVEN_GREEK_MOST_SUITABLE_COLLATION_GREEK_GENERAL_CI="greek - ISO 8859-7 Greek (most suitable collation = greek_general_ci)"
@@ -950,6 +947,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL="Tab Setup Options"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOT_REQUIRED="Not Required"
+COM_COMPONENTBUILDER_ADMIN_VIEW_OMIT="Omit"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ONLY_FUNCTION="Only Function"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PALETTE="Palette"
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 7bcce1a50..f456d2198 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -419,6 +419,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			{
 				$this->_db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id');
 			}
+
+			// update the mysql_table_engine defaults
+			if (isset($item->mysql_table_engine) && is_numeric($item->mysql_table_engine))
+			{
+				$item->mysql_table_engine = 'MyISAM';
+			}
+			// update the mysql_table_charset defaults
+			if (isset($item->mysql_table_charset) && is_numeric($item->mysql_table_charset))
+			{
+				$item->mysql_table_charset = 'utf8';
+			}
+			// update the mysql_table_collate defaults
+			if (isset($item->mysql_table_collate) && is_numeric($item->mysql_table_collate))
+			{
+				$item->mysql_table_collate = 'utf8_general_ci';
+			}
 			
 			if (!empty($item->id))
 			{
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 9099467ab..1fe000cd8 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -352,10 +352,8 @@
 			multiple="false"
 			filter="CMD"
 			required="true"
-			default="1">
+			default="utf8mb4_general_ci">
 			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT_GENERAL_CI</option>
 			<option value="big5_chinese_ci">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_CHINESE_CI_CHARSET_BIGFIVE</option>
 			<option value="big5_bin">
@@ -1168,10 +1166,8 @@
 			multiple="false"
 			filter="CMD"
 			required="true"
-			default="1">
+			default="InnoDB">
 			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_MYISAM</option>
 			<option value="MyISAM">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM</option>
 			<option value="InnoDB">
@@ -2267,10 +2263,8 @@
 			multiple="false"
 			filter="CMD"
 			required="true"
-			default="1">
+			default="utf8mb4">
 			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT</option>
 			<option value="big5">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_BIGFIVE_BIGFIVE_TRADITIONAL_CHINESE_MOST_SUITABLE_COLLATION_BIGFIVE_CHINESE_CI</option>
 			<option value="dec8">
@@ -2380,10 +2374,10 @@
 			class="list_class"
 			multiple="false"
 			required="true"
-			default="0">
+			default="DYNAMIC">
 			<!-- Option Set. -->
 			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT</option>
+				COM_COMPONENTBUILDER_ADMIN_VIEW_OMIT</option>
 			<option value="REDUNDANT">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_REDUNDANT</option>
 			<option value="COMPACT">
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index e79d0f450..f03b74ec4 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -411,15 +411,13 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// get components global params
-			$params = JComponentHelper::getParams('com_componentbuilder');
 			// set company defaults
-			$form->setValue('companyname', null, $params->get('export_company', ''));
-			$form->setValue('author', null, $params->get('export_owner', ''));
-			$form->setValue('email', null, $params->get('export_email', ''));
-			$form->setValue('website', null, $params->get('export_website', ''));
-			$form->setValue('copyright', null, $params->get('export_copyright', 'Copyright (C) 2015. All Rights Reserved'));
-			$form->setValue('license', null, $params->get('export_license', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html'));
+			$form->setValue('companyname', null, JComponentHelper::getParams('com_componentbuilder')->get('export_company', ''));
+			$form->setValue('author', null, JComponentHelper::getParams('com_componentbuilder')->get('export_owner', ''));
+			$form->setValue('email', null, JComponentHelper::getParams('com_componentbuilder')->get('export_email', ''));
+			$form->setValue('website', null, JComponentHelper::getParams('com_componentbuilder')->get('export_website', ''));
+			$form->setValue('copyright', null, JComponentHelper::getParams('com_componentbuilder')->get('export_copyright', 'Copyright (C) 2015. All Rights Reserved'));
+			$form->setValue('license', null, JComponentHelper::getParams('com_componentbuilder')->get('export_license', 'GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html'));
 		}
 		return $form;
 	}
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 5f9152b3b..6f6e3261f 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>15th May, 2019</creationDate>
+	<creationDate>16th May, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From d7d4ec43e6babeebaab358885c59c685db04b20c Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Mon, 20 May 2019 14:14:43 +0200
Subject: [PATCH 04/26] Added the options to include the xml files to also be
 target with custom code placeholders.

---
 README.md                        |  2 +-
 admin/README.txt                 |  2 +-
 admin/helpers/compiler/a_Get.php | 32 +++++++++++++++++---------------
 componentbuilder.xml             |  2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 19e759ab3..5c0a7d231 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th May, 2019
++ *Last Build*: 20th May, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 19e759ab3..5c0a7d231 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th May, 2019
++ *Last Build*: 20th May, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 50adbd094..dc9b2c255 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -5743,7 +5743,7 @@ class Get
 		$joomla = getcwd();
 		$counter = array(1 => 0, 2 => 0);
 		// file types to get
-		$fileTypes = array('\.php', '\.js');
+		$fileTypes = array('\.php', '\.js', '\.xml');
 		// set some local placeholders
 		$placeholders = array();
 		$placeholders[ComponentbuilderHelper::safeString($this->componentCodeName, 'F') . 'Helper::'] = $this->bbb . 'Component' . $this->ddd . 'Helper::';
@@ -5756,20 +5756,24 @@ class Get
 			chdir($path);
 			foreach ($fileTypes as $type)
 			{
-				// get a list of files in the current directory tree (only PHP and JS for now)
+				// get a list of files in the current directory tree (only PHP, JS and XML for now)
 				$files = JFolder::files('.', $type, true, true);
-				foreach ($files as $file)
+				// check if files found
+				if (ComponentbuilderHelper::checkArray($files))
 				{
-					$this->searchFileContent($counter, $file, $target, $this->customCodePlaceholders, $placeholders, $today);
-					// insert new code
-					if (ComponentbuilderHelper::checkArray($this->newCustomCode))
+					foreach ($files as $file)
 					{
-						$this->setNewCustomCode(100);
-					}
-					// update existing custom code
-					if (ComponentbuilderHelper::checkArray($this->existingCustomCode))
-					{
-						$this->setExistingCustomCode(30);
+						$this->searchFileContent($counter, $file, $target, $this->customCodePlaceholders, $placeholders, $today);
+						// insert new code
+						if (ComponentbuilderHelper::checkArray($this->newCustomCode))
+						{
+							$this->setNewCustomCode(100);
+						}
+						// update existing custom code
+						if (ComponentbuilderHelper::checkArray($this->existingCustomCode))
+						{
+							$this->setExistingCustomCode(30);
+						}
 					}
 				}
 			}
@@ -6189,7 +6193,7 @@ class Get
 	 * @param   string   $updateString   The string to update
 	 * @param   string   $string         The string to use lang update
 	 *
-	 * @return  array
+	 * @return  string
 	 * 
 	 */
 	protected function setReverseLangPlaceholders($updateString, $string)
@@ -6263,8 +6267,6 @@ class Get
 	 * 1 -> Just replace (default)
 	 * 2 -> Check if data string has placeholders
 	 * 3 -> Remove placeholders not in data string
-	 * 
-	 * @param   int      $langSwitch    The lang switch
 	 *
 	 * @return  string
 	 * 
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 6f6e3261f..3302e3f15 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>16th May, 2019</creationDate>
+	<creationDate>20th May, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From a90d6f51f7ae05285c5abc576d251b820b6d005f Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Mon, 20 May 2019 22:54:40 +0200
Subject: [PATCH 05/26] Fixed the code search keys to include new views, and
 fields across JCB.

---
 README.md                                     |  2 +-
 admin/README.txt                              |  2 +-
 .../en-GB/en-GB.com_componentbuilder.ini      | 53 ++++++++++---------
 admin/models/ajax.php                         | 40 +++++++++-----
 admin/models/forms/custom_code.js             |  4 +-
 admin/models/forms/placeholder.js             |  4 +-
 admin/models/joomla_components.php            | 38 ++++++++-----
 7 files changed, 89 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index 5c0a7d231..69a21f15a 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206393**
++ *Line count*: **206424**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 5c0a7d231..69a21f15a 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206393**
++ *Line count*: **206424**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index a07e188dc..ce57c939c 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -3790,18 +3790,20 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div c
 <div id='before-usedin'>Soon as enough data is available we will display all the areas where this code is used.</div>
 <div id='usedin-a' style='display: none;'><h2>Components</h2><div id='area-a'></div></div>
 <div id='usedin-b' style='display:none;'><h2>Component Dashboard</h2><div id='area-b'></div></div>
-<div id='usedin-c' style='display:none;'><h2>Admin Views</h2><div id='area-c'></div></div>
-<div id='usedin-d' style='display:none;'><h2>Admin Fields Relations</h2><div id='area-d'></div></div>
-<div id='usedin-e' style='display:none;'><h2>Custom Admin Views</h2><div id='area-e'></div></div>
-<div id='usedin-f' style='display:none;'><h2>Site Views</h2><div id='area-f'></div></div>
-<div id='usedin-g' style='display:none;'><h2>Fields</h2><div id='area-g'></div></div>
-<div id='usedin-h' style='display:none;'><h2>Fieldtypes</h2><div id='area-h'></div></div>
-<div id='usedin-i' style='display:none;'><h2>Dynamic Gets</h2><div id='area-i'></div></div>
-<div id='usedin-j' style='display:none;'><h2>Templates</h2><div id='area-j'></div></div>
-<div id='usedin-k' style='display:none;'><h2>Layouts</h2><div id='area-k'></div></div>
-<div id='usedin-l' style='display:none;'><h2>Libraries</h2><div id='area-l'></div></div>
-<div id='usedin-m' style='display:none;'><h2>Custom Code</h2><div id='area-m'></div></div>
-<div id='usedin-n' style='display:none;'><h2>Validation Rule</h2><div id='area-n'></div></div>
+<div id='usedin-c' style='display:none;'><h2>Component Placeholders</h2><div id='area-c'></div></div>
+<div id='usedin-d' style='display:none;'><h2>Admin Views</h2><div id='area-d'></div></div>
+<div id='usedin-e' style='display:none;'><h2>Admin Fields Relations</h2><div id='area-e'></div></div>
+<div id='usedin-f' style='display:none;'><h2>Admin Custom Tabs</h2><div id='area-f'></div></div>
+<div id='usedin-g' style='display:none;'><h2>Custom Admin Views</h2><div id='area-g'></div></div>
+<div id='usedin-h' style='display:none;'><h2>Site Views</h2><div id='area-h'></div></div>
+<div id='usedin-i' style='display:none;'><h2>Fields</h2><div id='area-i'></div></div>
+<div id='usedin-j' style='display:none;'><h2>Fieldtypes</h2><div id='area-j'></div></div>
+<div id='usedin-k' style='display:none;'><h2>Dynamic Gets</h2><div id='area-k'></div></div>
+<div id='usedin-l' style='display:none;'><h2>Templates</h2><div id='area-l'></div></div>
+<div id='usedin-m' style='display:none;'><h2>Layouts</h2><div id='area-m'></div></div>
+<div id='usedin-n' style='display:none;'><h2>Libraries</h2><div id='area-n'></div></div>
+<div id='usedin-o' style='display:none;'><h2>Custom Code</h2><div id='area-o'></div></div>
+<div id='usedin-p' style='display:none;'><h2>Validation Rule</h2><div id='area-p'></div></div>
 <div id='loading-usedin' style='display: none;'><h2>Scanning Database<span class='loading-dots'>..</span></h2></div>
 <div id='note-usedin-found' style='display: none;'><small>You can edit the above areas where this code is used.</small></div>
 <div id='note-usedin-not' style='display: none;'><small>This code is not used in any area of the JCB custom code blocks at this time.</small></div>
@@ -5461,6 +5463,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_LABEL="URL to your WHMCS install
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE="Error! Please add website here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES="Yes"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZIP="ZIP"
+COM_COMPONENTBUILDER_JOOMLA_FIELDS="Joomla fields"
 COM_COMPONENTBUILDER_JUST_GET_ALL_SNIPPETS="Just Get All Snippets"
 COM_COMPONENTBUILDER_KEEP_HISTORY="Keep History"
 COM_COMPONENTBUILDER_KEEP_ORIGINAL_ACCESS="- Keep Original Access -"
@@ -6273,18 +6276,20 @@ COM_COMPONENTBUILDER_PLACEHOLDER_NOTE_PLACEHOLDERS_PLACEDIN_DESCRIPTION="<div cl
 <div id='before-placedin'>Soon as enough data is available we will display all the areas where this placeholder is used.</div>
 <div id='placedin-a' style='display: none;'><h2>Components</h2><div id='area-a'></div></div>
 <div id='placedin-b' style='display:none;'><h2>Component Dashboard</h2><div id='area-b'></div></div>
-<div id='placedin-c' style='display:none;'><h2>Admin Views</h2><div id='area-c'></div></div>
-<div id='placedin-d' style='display:none;'><h2>Admin Fields Relations</h2><div id='area-d'></div></div>
-<div id='placedin-e' style='display:none;'><h2>Custom Admin Views</h2><div id='area-e'></div></div>
-<div id='placedin-f' style='display:none;'><h2>Site Views</h2><div id='area-f'></div></div>
-<div id='placedin-g' style='display:none;'><h2>Fields</h2><div id='area-g'></div></div>
-<div id='placedin-h' style='display:none;'><h2>Fieldtypes</h2><div id='area-h'></div></div>
-<div id='placedin-i' style='display:none;'><h2>Dynamic Gets</h2><div id='area-i'></div></div>
-<div id='placedin-j' style='display:none;'><h2>Templates</h2><div id='area-j'></div></div>
-<div id='placedin-k' style='display:none;'><h2>Layouts</h2><div id='area-k'></div></div>
-<div id='placedin-l' style='display:none;'><h2>Libraries</h2><div id='area-l'></div></div>
-<div id='placedin-m' style='display:none;'><h2>Custom Code</h2><div id='area-m'></div></div>
-<div id='placedin-n' style='display:none;'><h2>Validation Rule</h2><div id='area-n'></div></div>
+<div id='placedin-c' style='display:none;'><h2>Component Placeholders</h2><div id='area-c'></div></div>
+<div id='placedin-d' style='display:none;'><h2>Admin Views</h2><div id='area-d'></div></div>
+<div id='placedin-e' style='display:none;'><h2>Admin Fields Relations</h2><div id='area-e'></div></div>
+<div id='placedin-f' style='display:none;'><h2>Admin Custom Tabs</h2><div id='area-f'></div></div>
+<div id='placedin-g' style='display:none;'><h2>Custom Admin Views</h2><div id='area-g'></div></div>
+<div id='placedin-h' style='display:none;'><h2>Site Views</h2><div id='area-h'></div></div>
+<div id='placedin-i' style='display:none;'><h2>Fields</h2><div id='area-i'></div></div>
+<div id='placedin-j' style='display:none;'><h2>Fieldtypes</h2><div id='area-j'></div></div>
+<div id='placedin-k' style='display:none;'><h2>Dynamic Gets</h2><div id='area-k'></div></div>
+<div id='placedin-l' style='display:none;'><h2>Templates</h2><div id='area-l'></div></div>
+<div id='placedin-m' style='display:none;'><h2>Layouts</h2><div id='area-m'></div></div>
+<div id='placedin-n' style='display:none;'><h2>Libraries</h2><div id='area-n'></div></div>
+<div id='placedin-o' style='display:none;'><h2>Custom Code</h2><div id='area-o'></div></div>
+<div id='placedin-p' style='display:none;'><h2>Validation Rule</h2><div id='area-p'></div></div>
 <div id='loading-placedin' style='display: none;'><h2>Scanning Database<span class='loading-dots'>..</span></h2></div>
 <div id='note-placedin-found' style='display: none;'><small>You can edit the above areas where this placeholder is used.</small></div>
 <div id='note-placedin-not' style='display: none;'><small>This placeholder is not used in any area of the JCB custom code blocks at this time.</small></div>
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 77128b307..c72d9bd91 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -527,6 +527,7 @@ class ComponentbuilderModelAjax extends JModelList
 				'dashboard_add' => 'setYesNo',
 				'checkin' => 'setYesNo',
 				'history' => 'setYesNo',
+				'joomla_fields' => 'setYesNo',
 				'port' => 'setYesNo',
 				'edit_create_site_view' => 'setYesNo',
 				'icomoon' => 'setIcoMoon',
@@ -580,6 +581,7 @@ class ComponentbuilderModelAjax extends JModelList
 			'submenu' => JText::_('COM_COMPONENTBUILDER_SUBMENU'),
 			'checkin' => JText::_('COM_COMPONENTBUILDER_AUTO_CHECKIN'),
 			'history' => JText::_('COM_COMPONENTBUILDER_KEEP_HISTORY'),
+			'joomla_fields' => JText::_('COM_COMPONENTBUILDER_JOOMLA_FIELDS'),
 			'port' => JText::_('COM_COMPONENTBUILDER_EXPORTIMPORT_DATA'),
 			'edit_create_site_view' => JText::_('COM_COMPONENTBUILDER_EDITCREATE_SITE_VIEW'),
 			'icomoon' => JText::_('COM_COMPONENTBUILDER_ICON'),
@@ -2272,7 +2274,14 @@ class ComponentbuilderModelAjax extends JModelList
 			'not_base64' => array('dashboard_tab' => 'json'),
 			'name' => 'joomla_component->id:joomla_component.system_name'
 		),
-		// #__componentbuilder_admin_view (c)
+		// #__componentbuilder_component_placeholders (c)
+		'component_placeholders' => array(
+			'search' => array('id', 'joomla_component', 'addplaceholders'),
+			'views' => 'components_placeholders',
+			'not_base64' => array('addplaceholders' => 'json'),
+			'name' => 'joomla_component->id:joomla_component.system_name'
+		),
+		// #__componentbuilder_admin_view (d)
 		'admin_view' => array(
 			'search' => array('id', 'system_name', 'javascript_view_file', 'javascript_view_footer',
 				'javascript_views_file', 'javascript_views_footer', 'html_import_view',
@@ -2285,14 +2294,21 @@ class ComponentbuilderModelAjax extends JModelList
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_admin_fields_relations (d)
+		// #__componentbuilder_admin_fields_relations (e)
 		'admin_fields_relations' => array(
 			'search' => array('id', 'admin_view', 'addrelations'),
 			'views' => 'admins_fields_relations',
 			'not_base64' => array('addrelations' => 'json'),
 			'name' => 'admin_view->id:admin_view.system_name'
 		),
-		// #__componentbuilder_custom_admin_view (e)
+		// #__componentbuilder_admin_custom_tabs (f)
+		'admin_custom_tabs' => array(
+			'search' => array('id', 'admin_view', 'tabs'),
+			'views' => 'admins_custom_tabs',
+			'not_base64' => array('tabs' => 'json'),
+			'name' => 'admin_view->id:admin_view.system_name'
+		),
+		// #__componentbuilder_custom_admin_view (g)
 		'custom_admin_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
 				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
@@ -2300,7 +2316,7 @@ class ComponentbuilderModelAjax extends JModelList
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_site_view (f)
+		// #__componentbuilder_site_view (h)
 		'site_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
 				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
@@ -2308,7 +2324,7 @@ class ComponentbuilderModelAjax extends JModelList
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_field (g)
+		// #__componentbuilder_field (i)
 		'field' => array(
 			'search' => array('id', 'name', 'xml', 'javascript_view_footer', 'javascript_views_footer'),
 			'views' => 'fields',
@@ -2316,14 +2332,14 @@ class ComponentbuilderModelAjax extends JModelList
 			'base64_search' => array('xml' => array('start' => 'type_php', '_start' => '="', 'end' => '"')),
 			'name' => 'name'
 		),
-		// #__componentbuilder_fieldtype (h)
+		// #__componentbuilder_fieldtype (j)
 		'fieldtype' => array(
 			'search' => array('id', 'name', 'properties'),
 			'views' => 'fieldtypes',
 			'not_base64' => array('properties' => 'json'),
 			'name' => 'name'
 		),
-		// #__componentbuilder_dynamic_get (i)
+		// #__componentbuilder_dynamic_get (k)
 		'dynamic_get' => array(
 			'search' => array('id', 'name', 'php_before_getitem', 'php_after_getitem', 'php_before_getitems', 'php_after_getitems',
 				'php_getlistquery'),
@@ -2331,35 +2347,35 @@ class ComponentbuilderModelAjax extends JModelList
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_template (j)
+		// #__componentbuilder_template (l)
 		'template' => array(
 			'search' => array('id', 'name', 'php_view', 'template'),
 			'views' => 'templates',
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_layout (k)
+		// #__componentbuilder_layout (m)
 		'layout' => array(
 			'search' => array('id', 'name', 'php_view', 'layout'),
 			'views' => 'layouts',
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_library (l)
+		// #__componentbuilder_library (n)
 		'library' => array(
 			'search' => array('id', 'name', 'php_setdocument'),
 			'views' => 'libraries',
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_custom_code (m)
+		// #__componentbuilder_custom_code (o)
 		'custom_code' => array(
 			'search' => array('id', 'system_name', 'code'),
 			'views' => 'custom_codes',
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_validation_rule (n)
+		// #__componentbuilder_validation_rule (p)
 		'validation_rule' => array(
 			'search' => array('id', 'name', 'php'),
 			'views' => 'validation_rules',
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index d2e0dfb44..7fb122223 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -313,8 +313,8 @@ function usedin(functioName, ide) {
 	jQuery('#note-usedin-not').hide();
 	jQuery('#note-usedin-found').hide();
 	jQuery('#loading-usedin').show();
-	var targets = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n']; // if you update this, also update (below 13) & [customcode-codeUsedInHtmlNote]!
-	var targetNumber = 13;
+	var targets = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p']; // if you update this, also update (below 15) & [customcode-codeUsedInHtmlNote]!
+	var targetNumber = 15;
 	var run = 0;
 	var usedinChecker = setInterval(function(){ 
 		var target = targets[run];
diff --git a/admin/models/forms/placeholder.js b/admin/models/forms/placeholder.js
index b7470de5d..871f1b71d 100644
--- a/admin/models/forms/placeholder.js
+++ b/admin/models/forms/placeholder.js
@@ -79,8 +79,8 @@ function placedin(placeholder, ide) {
 	jQuery('#note-placedin-not').hide();
 	jQuery('#note-placedin-found').hide();
 	jQuery('#loading-placedin').show();
-	var targets = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n']; // if you update this, also update (below 13) & [customcode-codeUsedInHtmlNote]!
-	var targetNumber = 13;
+	var targets = ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p']; // if you update this, also update (below 15) & [customcode-codeUsedInHtmlNote]!
+	var targetNumber = 15;
 	var run = 0;
 	var placedinChecker = setInterval(function(){ 
 		var target = targets[run];
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index 707298c21..1121e55b0 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -1714,7 +1714,14 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'not_base64' => array('dashboard_tab' => 'json'),
 			'name' => 'joomla_component->id:joomla_component.system_name'
 		),
-		// #__componentbuilder_admin_view (c)
+		// #__componentbuilder_component_placeholders (c)
+		'component_placeholders' => array(
+			'search' => array('id', 'joomla_component', 'addplaceholders'),
+			'views' => 'components_placeholders',
+			'not_base64' => array('addplaceholders' => 'json'),
+			'name' => 'joomla_component->id:joomla_component.system_name'
+		),
+		// #__componentbuilder_admin_view (d)
 		'admin_view' => array(
 			'search' => array('id', 'system_name', 'javascript_view_file', 'javascript_view_footer',
 				'javascript_views_file', 'javascript_views_footer', 'html_import_view',
@@ -1727,14 +1734,21 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_admin_fields_relations (d)
+		// #__componentbuilder_admin_fields_relations (e)
 		'admin_fields_relations' => array(
 			'search' => array('id', 'admin_view', 'addrelations'),
 			'views' => 'admins_fields_relations',
 			'not_base64' => array('addrelations' => 'json'),
 			'name' => 'admin_view->id:admin_view.system_name'
 		),
-		// #__componentbuilder_custom_admin_view (e)
+		// #__componentbuilder_admin_custom_tabs (f)
+		'admin_custom_tabs' => array(
+			'search' => array('id', 'admin_view', 'tabs'),
+			'views' => 'admins_custom_tabs',
+			'not_base64' => array('tabs' => 'json'),
+			'name' => 'admin_view->id:admin_view.system_name'
+		),
+		// #__componentbuilder_custom_admin_view (g)
 		'custom_admin_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
 				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
@@ -1742,7 +1756,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_site_view (f)
+		// #__componentbuilder_site_view (h)
 		'site_view' => array(
 			'search' => array('id', 'system_name', 'default', 'php_view', 'php_jview', 'php_jview_display', 'php_document',
 				'js_document', 'css_document', 'css', 'php_ajaxmethod', 'php_model', 'php_controller'),
@@ -1750,7 +1764,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_field (g)
+		// #__componentbuilder_field (i)
 		'field' => array(
 			'search' => array('id', 'name', 'xml', 'javascript_view_footer', 'javascript_views_footer'),
 			'views' => 'fields',
@@ -1758,14 +1772,14 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'base64_search' => array('xml' => array('start' => 'type_php', '_start' => '="', 'end' => '"')),
 			'name' => 'name'
 		),
-		// #__componentbuilder_fieldtype (h)
+		// #__componentbuilder_fieldtype (j)
 		'fieldtype' => array(
 			'search' => array('id', 'name', 'properties'),
 			'views' => 'fieldtypes',
 			'not_base64' => array('properties' => 'json'),
 			'name' => 'name'
 		),
-		// #__componentbuilder_dynamic_get (i)
+		// #__componentbuilder_dynamic_get (k)
 		'dynamic_get' => array(
 			'search' => array('id', 'name', 'php_before_getitem', 'php_after_getitem', 'php_before_getitems', 'php_after_getitems',
 				'php_getlistquery'),
@@ -1773,35 +1787,35 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_template (j)
+		// #__componentbuilder_template (l)
 		'template' => array(
 			'search' => array('id', 'name', 'php_view', 'template'),
 			'views' => 'templates',
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_layout (k)
+		// #__componentbuilder_layout (m)
 		'layout' => array(
 			'search' => array('id', 'name', 'php_view', 'layout'),
 			'views' => 'layouts',
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_library (l)
+		// #__componentbuilder_library (n)
 		'library' => array(
 			'search' => array('id', 'name', 'php_setdocument'),
 			'views' => 'libraries',
 			'not_base64' => array(),
 			'name' => 'name'
 		),
-		// #__componentbuilder_custom_code (m)
+		// #__componentbuilder_custom_code (o)
 		'custom_code' => array(
 			'search' => array('id', 'system_name', 'code'),
 			'views' => 'custom_codes',
 			'not_base64' => array(),
 			'name' => 'system_name'
 		),
-		// #__componentbuilder_validation_rule (n)
+		// #__componentbuilder_validation_rule (p)
 		'validation_rule' => array(
 			'search' => array('id', 'name', 'php'),
 			'views' => 'validation_rules',
-- 
2.40.1


From dda33d66cb8a1a6911a0afa36301b5024b9f749f Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sat, 25 May 2019 22:20:12 +0200
Subject: [PATCH 06/26] fixed the subform build, to allow required value to be
 set to true.

---
 README.md                                     |  4 +-
 admin/README.txt                              |  4 +-
 admin/config.xml                              |  5 +-
 admin/helpers/compiler/c_Fields.php           |  6 +-
 admin/models/forms/admin_custom_tabs.xml      |  7 +--
 admin/models/forms/admin_fields.xml           | 16 +----
 .../models/forms/admin_fields_conditions.xml  | 12 ++--
 admin/models/forms/admin_fields_relations.xml |  7 +--
 admin/models/forms/admin_view.xml             | 33 ++++------
 admin/models/forms/component_admin_views.xml  | 27 ++++-----
 admin/models/forms/component_config.xml       |  2 +-
 .../forms/component_custom_admin_menus.xml    | 12 ++--
 .../forms/component_custom_admin_views.xml    | 17 +++---
 admin/models/forms/component_dashboard.xml    |  6 +-
 .../models/forms/component_files_folders.xml  | 20 +++----
 admin/models/forms/component_mysql_tweaks.xml |  5 +-
 admin/models/forms/component_placeholders.xml |  4 +-
 admin/models/forms/component_site_views.xml   | 12 ++--
 admin/models/forms/component_updates.xml      |  3 +-
 admin/models/forms/custom_admin_view.xml      | 17 ++----
 admin/models/forms/dynamic_get.xml            | 60 +++++++++----------
 admin/models/forms/fieldtype.xml              |  7 +--
 admin/models/forms/joomla_component.xml       |  9 +--
 admin/models/forms/language_translation.xml   |  3 +-
 admin/models/forms/library.xml                | 12 ++--
 admin/models/forms/library_config.xml         |  2 +-
 .../forms/library_files_folders_urls.xml      | 24 ++++----
 admin/models/forms/site_view.xml              | 17 ++----
 componentbuilder.xml                          |  2 +-
 29 files changed, 148 insertions(+), 207 deletions(-)

diff --git a/README.md b/README.md
index 69a21f15a..ad5d4f319 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 20th May, 2019
++ *Last Build*: 25th May, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206424**
++ *Line count*: **206365**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 69a21f15a..ad5d4f319 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 20th May, 2019
++ *Last Build*: 25th May, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206424**
++ *Line count*: **206365**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/config.xml b/admin/config.xml
index 53a28c3b9..7ece41d41 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -711,7 +711,7 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Backup Field. Type: Checkbox. (joomla) -->
@@ -720,7 +720,6 @@
 					name="backup"
 					label="COM_COMPONENTBUILDER_CONFIG_BACKUP_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_CONFIG_BACKUP_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -730,7 +729,6 @@
 					name="repository"
 					label="COM_COMPONENTBUILDER_CONFIG_REPOSITORY_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_CONFIG_REPOSITORY_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -741,7 +739,6 @@
 					label="COM_COMPONENTBUILDER_CONFIG_PLACEHOLDERS_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_CONFIG_PLACEHOLDERS_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 30f8a2d5c..e2bad3de6 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -2249,14 +2249,14 @@ class Fields extends Structure
 				}
 				elseif ($property['name'] === 'button' && $setCustom)
 				{
-					// dont load the button to repeatable
+					// load the button string value if found
 					$xmlValue = (string) ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'button="', '"'));
 					// add to custom values
 					$fieldAttributes['custom']['add_button'] = (ComponentbuilderHelper::checkString($xmlValue) || 1 == $xmlValue) ? $xmlValue : 'false';
 				}
-				elseif ($property['name'] === 'required' && $repeatable)
+				elseif ($property['name'] === 'required' && 'repeatable' === $typeName)
 				{
-					// dont load the required to repeatable
+					// dont load the required to repeatable field type
 					$xmlValue = 'false';
 				}
 				elseif ($viewType == 2 && ($property['name'] === 'readonly' || $property['name'] === 'disabled'))
diff --git a/admin/models/forms/admin_custom_tabs.xml b/admin/models/forms/admin_custom_tabs.xml
index 02991f1d7..786c03827 100644
--- a/admin/models/forms/admin_custom_tabs.xml
+++ b/admin/models/forms/admin_custom_tabs.xml
@@ -119,7 +119,6 @@
 					class="fieldMedium"
 					multiple="false"
 					default="1"
-					required="false"
 					button="false"
 				/>
 				<!-- Position Field. Type: List. (joomla) -->
@@ -130,7 +129,6 @@
 					description="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_POSITION_DESCRIPTION"
 					class="list_class"
 					multiple="false"
-					required="false"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -149,7 +147,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NAME_HINT"
@@ -160,7 +158,6 @@
 					name="permission"
 					label="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -175,7 +172,7 @@
 					class="text_area tab_html"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_HTML_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml
index 2948f6b46..7d87d4478 100644
--- a/admin/models/forms/admin_fields.xml
+++ b/admin/models/forms/admin_fields.xml
@@ -119,7 +119,7 @@
 					class="list_class fieldFull"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- List Field. Type: List. (joomla) -->
@@ -130,7 +130,6 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION"
 					class="fieldMedium count-the-items1235"
 					multiple="false"
-					required="false"
 					onchange="checkAdminBehaviour(this)">
 					<!-- Option Set. -->
 					<option value="">
@@ -151,7 +150,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_DESCRIPTION"
 					class="fieldSmall"
-					required="false"
 					first="0"
 					last="20"
 					step="1"
@@ -164,7 +162,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION"
 					class="inputbox"
 					onchange="checkTitle(this)"
@@ -176,7 +173,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_DESCRIPTION"
 					class="inputbox"
 					onchange="checkAlias(this)"
@@ -188,7 +184,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -199,7 +194,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -210,7 +204,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -221,7 +214,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_LABEL"
 					value="1"
 					default=""
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -234,7 +226,6 @@
 					class="fieldMedium"
 					multiple="false"
 					default="1"
-					required="false"
 					button="false"
 				/>
 				<!-- Alignment Field. Type: List. (joomla) -->
@@ -246,7 +237,6 @@
 					class="fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -272,7 +262,6 @@
 					default="0"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_DESCRIPTION"
 					class="fieldSmall"
-					required="false"
 					first="0"
 					last="100"
 					step="1"
@@ -284,8 +273,7 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_DESCRIPTION"
 					class="fieldMedium"
-					multiple="true"
-					required="false">
+					multiple="true">
 					<!-- Option Set. -->
 					<option value="1">
 						COM_COMPONENTBUILDER_ADMIN_FIELDS_EDITING</option>
diff --git a/admin/models/forms/admin_fields_conditions.xml b/admin/models/forms/admin_fields_conditions.xml
index e86813520..44257b742 100644
--- a/admin/models/forms/admin_fields_conditions.xml
+++ b/admin/models/forms/admin_fields_conditions.xml
@@ -118,7 +118,7 @@
 					class="fieldMedium"
 					multiple="true"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Target_behavior Field. Type: List. (joomla) -->
@@ -130,7 +130,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -151,7 +151,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
@@ -167,7 +167,7 @@
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_DESCRIPTION"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Match_behavior Field. Type: List. (joomla) -->
@@ -179,7 +179,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -217,7 +217,7 @@
 					class="text_area"
 					filter="STRING"
 					hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_OPTIONS_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/admin_fields_relations.xml b/admin/models/forms/admin_fields_relations.xml
index 6c393d94c..d73858694 100644
--- a/admin/models/forms/admin_fields_relations.xml
+++ b/admin/models/forms/admin_fields_relations.xml
@@ -118,7 +118,7 @@
 					class="fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					onchange="getCodeGlueOptions(this)"
 					button="false"
 				/>
@@ -131,7 +131,6 @@
 					maxlength="50"
 					default="Default"
 					class="text_area"
-					required="false"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_COLUMN_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_COLUMN_NAME_HINT"
@@ -146,7 +145,6 @@
 					class="fieldMedium"
 					multiple="true"
 					default=""
-					required="false"
 					onchange="getCodeGlueOptions(this)"
 					button="false"
 				/>
@@ -157,7 +155,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_AREA_LABEL"
 					class="list_class"
 					multiple="false"
-					required="false"
 					validate="int"
 					default="1"
 					onchange="getCodeGlueOptions(this)">
@@ -176,7 +173,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_JOIN_TYPE_LABEL"
 					class="list_class"
 					multiple="false"
-					required="false"
 					validate="int"
 					default="1"
 					onchange="getCodeGlueOptions(this)">
@@ -197,7 +193,6 @@
 					class="text_area codefield"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_SET_HINT"
-					required="false"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 1fe000cd8..0b3278446 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -297,7 +297,6 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
 					button="false"
 				/>
 				<!-- Sourcemap Field. Type: Textarea. (joomla) -->
@@ -311,7 +310,7 @@
 					class="text_area span4"
 					filter="HTML"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
@@ -886,7 +885,7 @@
 					class="list_class"
 					multiple="false"
 					filter="CMD"
-					required="false"
+					required="true"
 					default="">
 					<!-- Option Set. -->
 					<option value="core.edit">
@@ -933,7 +932,6 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -997,7 +995,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT"
@@ -1069,7 +1067,7 @@
 					class="fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Tab Field. Type: Integer. (joomla) -->
@@ -1080,7 +1078,6 @@
 					default="1"
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION"
 					class="fieldSmall"
-					required="false"
 					first="1"
 					last="14"
 					step="1"
@@ -1096,7 +1093,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT"
@@ -1112,7 +1109,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT"
@@ -1126,7 +1123,6 @@
 					class="list_class"
 					multiple="false"
 					filter="int"
-					required="false"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
@@ -1726,7 +1722,6 @@
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium icomoon342"
 					multiple="false"
-					required="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
 					<option value="joomla">
@@ -2161,7 +2156,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT"
@@ -2189,7 +2184,6 @@
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_DESCRIPTION"
 					class="list_class fieldMedium"
 					filter="INT"
-					required="false"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -2207,7 +2201,6 @@
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION"
 					class="list_class"
 					multiple="false"
-					required="false"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
@@ -2515,7 +2508,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_HINT"
@@ -2531,7 +2524,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_HINT"
@@ -2548,7 +2541,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_HINT"
@@ -2562,7 +2555,7 @@
 					class="list_class"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="INT">
 					<!-- Option Set. -->
 					<option value="INT">
@@ -2608,7 +2601,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_HINT"
@@ -2619,7 +2612,6 @@
 					name="allow_zero"
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -2630,7 +2622,6 @@
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_LABEL"
 					value="1"
 					default="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/models/forms/component_admin_views.xml b/admin/models/forms/component_admin_views.xml
index b64545c1f..4a59ffc99 100644
--- a/admin/models/forms/component_admin_views.xml
+++ b/admin/models/forms/component_admin_views.xml
@@ -119,7 +119,7 @@
 					class="fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Icomoon Field. Type: List. (joomla) -->
@@ -130,7 +130,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium icomoon342"
 					multiple="false"
-					required="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
 					<option value="joomla">
@@ -561,7 +560,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -572,7 +571,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -583,7 +582,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -594,7 +593,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -605,7 +604,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CHECKIN_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CHECKIN_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -616,7 +615,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_HISTORY_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_HISTORY_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -627,7 +626,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_FIELDS_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_FIELDS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -638,7 +637,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -649,7 +648,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -660,7 +659,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -671,8 +670,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT_CREATE_SITE_VIEW_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT_CREATE_SITE_VIEW_DESCRIPTION"
 					class="list_class fieldMedium"
-					multiple="false"
-					required="false">
+					multiple="false">
 					<!-- Option Set. -->
 					<option value="">
 						COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NONE</option>
@@ -689,7 +687,6 @@
 					default="0"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ORDER_DESCRIPTION"
 					class="fieldSmall"
-					required="false"
 					first="0"
 					last="400"
 					step="1"
diff --git a/admin/models/forms/component_config.xml b/admin/models/forms/component_config.xml
index 99fbfcfe6..a3e64055b 100644
--- a/admin/models/forms/component_config.xml
+++ b/admin/models/forms/component_config.xml
@@ -118,7 +118,7 @@
 					class="list_class fieldFull"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Custom_value Field. Type: Textarea. (joomla) -->
diff --git a/admin/models/forms/component_custom_admin_menus.xml b/admin/models/forms/component_custom_admin_menus.xml
index d49df75da..fe82909b8 100644
--- a/admin/models/forms/component_custom_admin_menus.xml
+++ b/admin/models/forms/component_custom_admin_menus.xml
@@ -119,7 +119,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_HINT"
@@ -134,7 +134,7 @@
 					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_DESCRIPTION"
 					class="text_area"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_HINT"
@@ -172,7 +172,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -183,7 +183,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -194,7 +194,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -207,7 +207,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 			</form>
diff --git a/admin/models/forms/component_custom_admin_views.xml b/admin/models/forms/component_custom_admin_views.xml
index d0408d864..adbade988 100644
--- a/admin/models/forms/component_custom_admin_views.xml
+++ b/admin/models/forms/component_custom_admin_views.xml
@@ -117,7 +117,7 @@
 					class="fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Icomoon Field. Type: List. (joomla) -->
@@ -128,7 +128,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium icomoon342"
 					multiple="false"
-					required="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
 					<option value="joomla">
@@ -559,7 +558,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -570,7 +569,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -581,7 +580,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -592,7 +591,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -603,7 +602,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -616,7 +615,7 @@
 					class="fieldMedium"
 					multiple="true"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Before Field. Type: Componentadminmenus. (custom) -->
@@ -628,7 +627,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 			</form>
diff --git a/admin/models/forms/component_dashboard.xml b/admin/models/forms/component_dashboard.xml
index d46201b35..cc70427cd 100644
--- a/admin/models/forms/component_dashboard.xml
+++ b/admin/models/forms/component_dashboard.xml
@@ -120,7 +120,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_HINT"
@@ -136,7 +136,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_HINT"
@@ -152,7 +152,7 @@
 					class="text_area tab_html"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/component_files_folders.xml b/admin/models/forms/component_files_folders.xml
index 475d74a75..b3545f0a4 100644
--- a/admin/models/forms/component_files_folders.xml
+++ b/admin/models/forms/component_files_folders.xml
@@ -137,7 +137,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
@@ -149,7 +149,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -193,7 +193,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
@@ -205,7 +205,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -233,7 +233,7 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Path Field. Type: Text. (joomla) -->
@@ -247,7 +247,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
@@ -259,7 +259,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -286,7 +286,7 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Path Field. Type: Text. (joomla) -->
@@ -300,7 +300,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
@@ -312,7 +312,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/models/forms/component_mysql_tweaks.xml b/admin/models/forms/component_mysql_tweaks.xml
index 94773ba4c..c114f4665 100644
--- a/admin/models/forms/component_mysql_tweaks.xml
+++ b/admin/models/forms/component_mysql_tweaks.xml
@@ -118,7 +118,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Add_sql Field. Type: List. (joomla) -->
@@ -130,7 +130,6 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
@@ -147,7 +146,6 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
 					default="">
 					<!-- Option Set. -->
 					<option value="">
@@ -169,7 +167,6 @@
 					class="text_area ids_selection"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_HINT"
-					required="false"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/component_placeholders.xml b/admin/models/forms/component_placeholders.xml
index d861e5090..b2ebbaaa7 100644
--- a/admin/models/forms/component_placeholders.xml
+++ b/admin/models/forms/component_placeholders.xml
@@ -118,7 +118,7 @@
 					maxlength="150"
 					description="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_TARGET_DESCRIPTION"
 					class="text_area"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_TARGET_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_TARGET_HINT"
@@ -132,7 +132,7 @@
 					size="150"
 					description="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VALUE_DESCRIPTION"
 					class="text_area"
-					required="false"
+					required="true"
 					filter="RAW"
 					message="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VALUE_MESSAGE"
 					hint="COM_COMPONENTBUILDER_COMPONENT_PLACEHOLDERS_VALUE_HINT"
diff --git a/admin/models/forms/component_site_views.xml b/admin/models/forms/component_site_views.xml
index 95eb45277..fbccadb38 100644
--- a/admin/models/forms/component_site_views.xml
+++ b/admin/models/forms/component_site_views.xml
@@ -118,7 +118,7 @@
 					class="fieldMedium"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Menu Field. Type: Checkbox. (joomla) -->
@@ -128,7 +128,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -139,7 +139,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -150,7 +150,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -161,7 +161,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -172,7 +172,7 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/models/forms/component_updates.xml b/admin/models/forms/component_updates.xml
index 777a73099..348b9f614 100644
--- a/admin/models/forms/component_updates.xml
+++ b/admin/models/forms/component_updates.xml
@@ -138,7 +138,6 @@
 					class="text_area mysql_update"
 					filter="raw"
 					hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_HINT"
-					required="false"
 				/>
 				<!-- Url Field. Type: Url. (joomla) -->
 				<field
@@ -150,7 +149,7 @@
 					default=""
 					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_DESCRIPTION"
 					class="text_area version_url"
-					required="false"
+					required="true"
 					filter="raw"
 					validated="url"
 					message="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_MESSAGE"
diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml
index 8dd317152..a358eef46 100644
--- a/admin/models/forms/custom_admin_view.xml
+++ b/admin/models/forms/custom_admin_view.xml
@@ -405,7 +405,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_HINT"
@@ -421,7 +421,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_HINT"
@@ -438,7 +438,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_MESSAGE"
 					hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_HINT"
@@ -452,7 +452,7 @@
 					class="list_class"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="INT">
 					<!-- Option Set. -->
 					<option value="INT">
@@ -498,7 +498,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_HINT"
@@ -509,7 +509,6 @@
 					name="allow_zero"
 					label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALLOW_ZERO_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALLOW_ZERO_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -520,7 +519,6 @@
 					label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_LABEL"
 					value="1"
 					default="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -692,7 +690,6 @@
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium icomoon342"
 					multiple="false"
-					required="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
 					<option value="joomla">
@@ -1127,7 +1124,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_HINT"
@@ -1155,7 +1152,6 @@
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TARGET_DESCRIPTION"
 					class="list_class fieldMedium"
 					filter="INT"
-					required="false"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -1173,7 +1169,6 @@
 					description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_DESCRIPTION"
 					class="list_class"
 					multiple="false"
-					required="false"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index eb47ec68f..b82c8dc0e 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -331,7 +331,7 @@
 					description="COM_COMPONENTBUILDER_DYNAMIC_GET_VIEW_TABLE_DESCRIPTION"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Row_type Field. Type: List. (joomla) -->
@@ -343,7 +343,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -359,7 +359,7 @@
 					class="list_class fieldSmall"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="b">
 					<!-- Option Set. -->
 					<option value="b">
@@ -473,7 +473,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -498,7 +498,7 @@
 					class="text_area fieldMedium"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT"
@@ -512,7 +512,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="0">
 					<!-- Option Set. -->
 					<option value="1">
@@ -549,7 +549,7 @@
 					class="text_area fieldMedium"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT"
@@ -565,7 +565,7 @@
 					class="text_area span12"
 					filter="HTML"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
@@ -601,7 +601,7 @@
 					description="COM_COMPONENTBUILDER_DYNAMIC_GET_DB_TABLE_DESCRIPTION"
 					class="list_class"
 					multiple="false"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Row_type Field. Type: List. (joomla) -->
@@ -613,7 +613,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -629,7 +629,7 @@
 					class="list_class fieldSmall"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="b">
 					<!-- Option Set. -->
 					<option value="b">
@@ -743,7 +743,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -768,7 +768,7 @@
 					class="text_area fieldMedium"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_ON_FIELD_HINT"
@@ -782,7 +782,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="0">
 					<!-- Option Set. -->
 					<option value="1">
@@ -819,7 +819,7 @@
 					class="text_area fieldMedium"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT"
@@ -835,7 +835,7 @@
 					class="text_area span12"
 					filter="HTML"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
@@ -977,7 +977,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -1014,7 +1014,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_STATE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_STATE_KEY_HINT"
@@ -1028,7 +1028,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="0">
 					<!-- Option Set. -->
 					<option value="1">
@@ -1065,7 +1065,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
@@ -1110,7 +1110,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
@@ -1124,7 +1124,7 @@
 					class="list_class fieldMedium"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="0">
 					<!-- Option Set. -->
 					<option value="1">
@@ -1161,7 +1161,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_HINT"
@@ -1202,7 +1202,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
@@ -1215,7 +1215,7 @@
 					class="list_class"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="">
 					<!-- Option Set. -->
 					<option value="ASC">
@@ -1250,7 +1250,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
@@ -1295,7 +1295,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="CMD"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_HINT"
@@ -1311,7 +1311,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_KEY_HINT"
@@ -1324,7 +1324,7 @@
 					class="list_class fieldSmall"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="a">
 					<!-- Option Set. -->
 					<option value="a">
@@ -1438,7 +1438,7 @@
 					name="type"
 					label="COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL"
 					default="2"
-					required="false">
+					required="true">
 					<!-- Option Set. -->
 					<option value="1">
 						COM_COMPONENTBUILDER_DYNAMIC_GET_STATE</option>
diff --git a/admin/models/forms/fieldtype.xml b/admin/models/forms/fieldtype.xml
index 4dfdde50e..d29eef73b 100644
--- a/admin/models/forms/fieldtype.xml
+++ b/admin/models/forms/fieldtype.xml
@@ -278,7 +278,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT"
@@ -296,7 +296,6 @@
 					class="text_area span12"
 					filter="RAW"
 					hint="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT"
-					required="false"
 				/>
 				<!-- Adjustable Field. Type: Checkbox. (joomla) -->
 				<field
@@ -304,7 +303,6 @@
 					name="adjustable"
 					label="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -314,7 +312,6 @@
 					name="mandatory"
 					label="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -324,7 +321,6 @@
 					name="translatable"
 					label="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -339,7 +335,6 @@
 					class="text_area"
 					filter="HTML"
 					hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT"
-					required="false"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/joomla_component.xml b/admin/models/forms/joomla_component.xml
index c9694d13e..2eeedcb3a 100644
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@@ -1204,7 +1204,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT"
@@ -1220,7 +1220,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_MESSAGE"
 					hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_HINT"
@@ -1234,7 +1234,7 @@
 					maxlength="50"
 					description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION"
 					class="text_area"
-					required="false"
+					required="true"
 					filter="STRING"
 					validate="email"
 					message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE"
@@ -1249,7 +1249,6 @@
 					maxlength="150"
 					description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION"
 					class="text_area"
-					required="false"
 					filter="url"
 					validated="url"
 					scheme="http,https"
@@ -1264,7 +1263,6 @@
 					description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_DESCRIPTION"
 					class="fieldMedium"
 					multiple="false"
-					required="false"
 					default="2">
 					<!-- Option Set. -->
 					<option value="0">
@@ -1282,7 +1280,6 @@
 					description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHOW_DESCRIPTION"
 					class="fieldMedium"
 					multiple="false"
-					required="false"
 					default="3">
 					<!-- Option Set. -->
 					<option value="0">
diff --git a/admin/models/forms/language_translation.xml b/admin/models/forms/language_translation.xml
index ecdc213d7..9a4f34015 100644
--- a/admin/models/forms/language_translation.xml
+++ b/admin/models/forms/language_translation.xml
@@ -133,7 +133,6 @@
 					class="text_area translation_text_area"
 					filter="STRING"
 					hint="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT"
-					required="false"
 				/>
 				<!-- Language Field. Type: Lang. (custom) -->
 				<field
@@ -143,7 +142,7 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 			</form>
diff --git a/admin/models/forms/library.xml b/admin/models/forms/library.xml
index c3ab905b8..c16da1c47 100644
--- a/admin/models/forms/library.xml
+++ b/admin/models/forms/library.xml
@@ -211,7 +211,7 @@
 					class="list_class"
 					multiple="true"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Target_behavior Field. Type: List. (joomla) -->
@@ -223,7 +223,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -240,7 +240,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
@@ -255,7 +255,7 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_DESCRIPTION"
 					multiple="false"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Option_behaviour Field. Type: List. (joomla) -->
@@ -267,7 +267,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -305,7 +305,7 @@
 					class="text_area"
 					filter="STRING"
 					hint="COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_HINT"
-					required="false"
+					required="true"
 				/>
 			</form>
 		</field>
diff --git a/admin/models/forms/library_config.xml b/admin/models/forms/library_config.xml
index c3c93af2d..01815163c 100644
--- a/admin/models/forms/library_config.xml
+++ b/admin/models/forms/library_config.xml
@@ -117,7 +117,7 @@
 					class="list_class fieldFull"
 					multiple="false"
 					default=""
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Custom_value Field. Type: Textarea. (joomla) -->
diff --git a/admin/models/forms/library_files_folders_urls.xml b/admin/models/forms/library_files_folders_urls.xml
index 284dd96a0..3334baa9f 100644
--- a/admin/models/forms/library_files_folders_urls.xml
+++ b/admin/models/forms/library_files_folders_urls.xml
@@ -136,7 +136,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
@@ -148,7 +148,7 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -192,7 +192,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
@@ -204,7 +204,7 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -232,7 +232,7 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Path Field. Type: Text. (joomla) -->
@@ -246,7 +246,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
@@ -258,7 +258,7 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -285,7 +285,7 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="false"
+					required="true"
 					button="false"
 				/>
 				<!-- Path Field. Type: Text. (joomla) -->
@@ -299,7 +299,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="PATH"
 					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
 					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
@@ -311,7 +311,7 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="false"
+					required="true"
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -340,7 +340,7 @@
 					default=""
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_DESCRIPTION"
 					class="text_area"
-					required="false"
+					required="true"
 					filter="url"
 					validated="url"
 					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_MESSAGE"
@@ -355,7 +355,7 @@
 					class="list_class"
 					multiple="false"
 					filter="INT"
-					required="false"
+					required="true"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml
index cf93815d0..b9c3f5a57 100644
--- a/admin/models/forms/site_view.xml
+++ b/admin/models/forms/site_view.xml
@@ -431,7 +431,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_SITE_VIEW_VALUE_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_SITE_VIEW_VALUE_NAME_HINT"
@@ -447,7 +447,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_SITE_VIEW_TASK_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_SITE_VIEW_TASK_NAME_HINT"
@@ -464,7 +464,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_SITE_VIEW_INPUT_DEFAULT_MESSAGE"
 					hint="COM_COMPONENTBUILDER_SITE_VIEW_INPUT_DEFAULT_HINT"
@@ -478,7 +478,7 @@
 					class="list_class"
 					multiple="false"
 					filter="WORD"
-					required="false"
+					required="true"
 					default="INT">
 					<!-- Option Set. -->
 					<option value="INT">
@@ -524,7 +524,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="WORD"
 					message="COM_COMPONENTBUILDER_SITE_VIEW_METHOD_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_SITE_VIEW_METHOD_NAME_HINT"
@@ -535,7 +535,6 @@
 					name="allow_zero"
 					label="COM_COMPONENTBUILDER_SITE_VIEW_ALLOW_ZERO_LABEL"
 					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_SITE_VIEW_ALLOW_ZERO_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -546,7 +545,6 @@
 					label="COM_COMPONENTBUILDER_SITE_VIEW_USER_CHECK_LABEL"
 					value="1"
 					default="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_SITE_VIEW_USER_CHECK_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -742,7 +740,6 @@
 					description="COM_COMPONENTBUILDER_SITE_VIEW_ICOMOON_DESCRIPTION"
 					class="list_class fieldMedium icomoon342"
 					multiple="false"
-					required="false"
 					onchange="getIconImage(this);">
 					<!-- Option Set. -->
 					<option value="joomla">
@@ -1177,7 +1174,7 @@
 					class="text_area"
 					readonly="false"
 					disabled="false"
-					required="false"
+					required="true"
 					filter="STRING"
 					message="COM_COMPONENTBUILDER_SITE_VIEW_NAME_MESSAGE"
 					hint="COM_COMPONENTBUILDER_SITE_VIEW_NAME_HINT"
@@ -1205,7 +1202,6 @@
 					description="COM_COMPONENTBUILDER_SITE_VIEW_TARGET_DESCRIPTION"
 					class="list_class fieldMedium"
 					filter="INT"
-					required="false"
 					default="1">
 					<!-- Option Set. -->
 					<option value="1">
@@ -1223,7 +1219,6 @@
 					description="COM_COMPONENTBUILDER_SITE_VIEW_TYPE_DESCRIPTION"
 					class="list_class"
 					multiple="false"
-					required="false"
 					default="0">
 					<!-- Option Set. -->
 					<option value="0">
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 3302e3f15..1ce7f81cf 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>20th May, 2019</creationDate>
+	<creationDate>25th May, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From 76449b01eccd5d16029097fa600a1cd38e3c282f Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 5 Jun 2019 12:26:15 +0200
Subject: [PATCH 07/26] Fixed category filter issue. Fixed permissions accross
 JCB. Updated some notes on the field types.

---
 README.md                                   |  2 +-
 admin/README.txt                            |  2 +-
 admin/controllers/admin_views.php           |  2 +-
 admin/controllers/compiler.php              |  2 +-
 admin/controllers/custom_codes.php          |  2 +-
 admin/controllers/dynamic_gets.php          |  2 +-
 admin/controllers/fields.php                |  2 +-
 admin/controllers/joomla_component.php      |  2 +-
 admin/controllers/joomla_components.php     | 12 ++++++------
 admin/helpers/compiler/e_Interpretation.php | 14 +++++++-------
 admin/helpers/compiler/f_Infusion.php       |  2 +-
 admin/sql/install.mysql.utf8.sql            |  4 ++--
 admin/views/fields/view.html.php            |  4 ++--
 admin/views/fieldtypes/view.html.php        |  4 ++--
 componentbuilder.xml                        |  2 +-
 site/controllers/api.php                    |  2 +-
 16 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index ad5d4f319..f3ce4550c 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 25th May, 2019
++ *Last Build*: 5th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index ad5d4f319..f3ce4550c 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 25th May, 2019
++ *Last Build*: 5th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php
index bfd757d9d..8e158113b 100644
--- a/admin/controllers/admin_views.php
+++ b/admin/controllers/admin_views.php
@@ -121,7 +121,7 @@ class ComponentbuilderControllerAdmin_views extends JControllerAdmin
 		// set massage
 		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
 		// check if this user has the right to run expansion
-		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		if($user->authorise('admin_views.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php
index 0e5770100..720f41699 100644
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@@ -216,7 +216,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 		// set page redirect
 		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
 		$message = JText::_('COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER');
-		if($user->authorise('core.admin', 'com_componentbuilder'))
+		if($user->authorise('compiler.clear_tmp', 'com_componentbuilder') && $user->authorise('core.options', 'com_componentbuilder'))
 		{
 			// get the model
 			$model = $this->getModel('compiler');
diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php
index c80a23f66..eb1957194 100644
--- a/admin/controllers/custom_codes.php
+++ b/admin/controllers/custom_codes.php
@@ -121,7 +121,7 @@ class ComponentbuilderControllerCustom_codes extends JControllerAdmin
 		// set massage
 		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
 		// check if this user has the right to run expansion
-		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		if($user->authorise('custom_codes.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php
index bc43dd3fc..994738dac 100644
--- a/admin/controllers/dynamic_gets.php
+++ b/admin/controllers/dynamic_gets.php
@@ -121,7 +121,7 @@ class ComponentbuilderControllerDynamic_gets extends JControllerAdmin
 		// set massage
 		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
 		// check if this user has the right to run expansion
-		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		if($user->authorise('dynamic_gets.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php
index 6e3a3eaf4..4c99c975c 100644
--- a/admin/controllers/fields.php
+++ b/admin/controllers/fields.php
@@ -121,7 +121,7 @@ class ComponentbuilderControllerFields extends JControllerAdmin
 		// set massage
 		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
 		// check if this user has the right to run expansion
-		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		if($user->authorise('fields.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php
index 3cd654e60..53b48c600 100644
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@@ -45,7 +45,7 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
 		$user = JFactory::getUser();
-		if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		if ($user->authorise('joomla_component.import_jcb_packages', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
 		{
 			$session = JFactory::getSession();
 			$session->set('backto_VDM_IMPORT', 'joomla_components');
diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php
index e7ddde183..992cdb98f 100644
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@@ -121,7 +121,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		// set massage
 		$message = JText::_('COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_RUN_THE_EXPANSION_MODULE');
 		// check if this user has the right to run expansion
-		if($user->authorise('compiler.run_expansion', 'com_componentbuilder'))
+		if($user->authorise('joomla_components.run_expansion', 'com_componentbuilder'))
 		{
 			// set massage
 			$message = JText::_('COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_OPTIONS_OF_JCB_UNDER_THE_DEVELOPMENT_METHOD_TAB');
@@ -159,7 +159,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		// set page redirect
 		$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=joomla_components', false);
 		$message = JText::_('COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER');
-		if($user->authorise('core.admin', 'com_componentbuilder'))
+		if($user->authorise('joomla_components.clear_tmp', 'com_componentbuilder') && $user->authorise('core.options', 'com_componentbuilder'))
 		{
 			// get the model
 			$model = $this->getModel('compiler');
@@ -181,7 +181,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 	{
 		// check if import is allowed for this user.
 		$user = JFactory::getUser();
-		if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
+		if ($user->authorise('joomla_component.import_jcb_packages', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))
 		{
 			$session = JFactory::getSession();
 			$session->set('backto_VDM_IMPORT', 'joomla_components');
@@ -205,7 +205,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		$model = $this->getModel('Joomla_components');
 		// check if export is allowed for this user.
 		$model->user = JFactory::getUser();
-		if ($model->user->authorise('joomla_component.export', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
+		if ($model->user->authorise('joomla_component.export_jcb_packages', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
 		{
 			// Get the input
 			$input = JFactory::getApplication()->input;
@@ -289,7 +289,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		// make sure to set active type (adding this script from custom code :)
 		$model->activeType = 'manualBackup';
 		// check if export is allowed for this user. (we need this sorry)
-		if ($model->user->authorise('joomla_component.export', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
+		if ($model->user->authorise('joomla_component.export_jcb_packages', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
 		{
 			// get all component IDs to backup
 			$pks = componentbuilderHelper::getComponentIDs();
@@ -443,7 +443,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 		$model = $this->getModel('Joomla_components');
 		// check if export is allowed for this user.
 		$model->user = JFactory::getUser();
-		if ($model->user->authorise('joomla_component.cloner', 'com_componentbuilder') && $model->user->authorise('core.copy', 'com_componentbuilder'))
+		if ($model->user->authorise('joomla_component.clone', 'com_componentbuilder') && $model->user->authorise('core.copy', 'com_componentbuilder'))
 		{
 			// Get the input
 			$input = JFactory::getApplication()->input;
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 04443a66f..eec7d570d 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10929,29 +10929,29 @@ class Interpretation extends Fields
 		return '';
 	}
 
-	public function setCategoryFilter($viewName_list)
+	public function setCategoryFilter($viewName_single, $viewName_list)
 	{
 		if (isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list]))
 		{
 			// check if category has another name
 			if (isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list]))
 			{
-				$otherViews = $this->catOtherName[$viewName_list]['views'];
+				$targetView = "." . $this->catOtherName[$viewName_list]['view'];
 			}
 			else
 			{
-				$otherViews = $viewName_list;
+				$targetView = "." . $viewName_single;
 			}
 			// set component name
 			$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
-			$COMONENT = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
+			$COPMONENT = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
 			// set filter
 			$filter = array();
 			$filter[] = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Category Filter.";
 			$filter[] = $this->_t(2) . "JHtmlSidebar::addFilter(";
 			$filter[] = $this->_t(3) . "JText:" . ":_('JOPTION_SELECT_CATEGORY'),";
 			$filter[] = $this->_t(3) . "'filter_category_id',";
-			$filter[] = $this->_t(3) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . "." . $otherViews . "'), 'value', 'text', \$this->state->get('filter.category_id'))";
+			$filter[] = $this->_t(3) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . $targetView . "'), 'value', 'text', \$this->state->get('filter.category_id'))";
 			$filter[] = $this->_t(2) . ");";
 
 
@@ -10959,9 +10959,9 @@ class Interpretation extends Fields
 			$filter[] = $this->_t(2) . "{";
 			$filter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Category Batch selection.";
 			$filter[] = $this->_t(3) . "JHtmlBatch_::addListSelection(";
-			$filter[] = $this->_t(4) . "JText:" . ":_('COM_" . $COMONENT . "_KEEP_ORIGINAL_CATEGORY'),";
+			$filter[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT . "_KEEP_ORIGINAL_CATEGORY'),";
 			$filter[] = $this->_t(4) . "'batch[category]',";
-			$filter[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . "." . $otherViews . "'), 'value', 'text')";
+			$filter[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . $targetView . "'), 'value', 'text')";
 			$filter[] = $this->_t(3) . ");";
 			$filter[] = $this->_t(2) . "}";
 
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index af5d955c4..38abc6df4 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -438,7 +438,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_list][$this->hhh . 'SORTFIELDS' . $this->hhh] = $this->setSortFields($viewName_list);
 
 					// CATEGORYFILTER <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_list][$this->hhh . 'CATEGORYFILTER' . $this->hhh] = $this->setCategoryFilter($viewName_list);
+					$this->fileContentDynamic[$viewName_list][$this->hhh . 'CATEGORYFILTER' . $this->hhh] = $this->setCategoryFilter($viewName_single, $viewName_list);
 
 					// CATEGORY_VIEWS
 					if (!isset($this->fileContentStatic[$this->hhh . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]))
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 01370c330..b4ad5150d 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -1657,11 +1657,11 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 
 INSERT INTO `#__componentbuilder_fieldtype` (`id`, `catid`, `description`, `name`, `properties`, `short_description`, `params`, `published`, `version`, `hits`, `ordering`) VALUES
 (1, '', 'The calendar form field type provides a text box for entry of a date. An icon next to the text box provides a link to a pop-up calendar, which can also be used to enter the date value. If the field has a saved value this is shown in the text box. Otherwis', 'Calendar', '{\"properties0\":{\"name\":\"type\",\"example\":\"calendar\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be calendar.\"},\"properties1\":{\"name\":\"name\",\"example\":\"date\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a date\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"NOW\",\"adjustable\":\"1\",\"description\":\"(optional) is the default date. This must be given in the same format as specified by the format argument. You can put \\\"NOW\\\" to have current time.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the text box.\"},\"properties5\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is whether the text box is read-only (true or false). If the text box is read-only, the date cannot be changed, but can be selected and copied. No calendar icon will be shown.\"},\"properties6\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is whether the text box is disabled (true or false). If the text box is disabled, the date cannot be changed, selected or copied.\"},\"properties7\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field.\"},\"properties8\":{\"name\":\"format\",\"example\":\"%d-%m-%Y\",\"adjustable\":\"1\",\"description\":\"(optional) is the date format to be used. This is in the format used by PHP to specify date string formats (see below). If no format argument is given, \'%Y-%m-%d\' is assumed (giving dates like \'2008-04-16\').\"},\"properties9\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is time zone to be used. There are two values; server_utc and user_utc. The first one is server time zone and the later is user time zone as configured in global configuration and user information respectively.\"},\"properties10\":{\"name\":\"size\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional)\"},\"properties11\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"},\"properties22\":{\"name\":\"translateformat\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): If set to true, the calendar will use a language string to determine the format. The `format` attribute is ignored. If false, the `format` attribute is used (same behaviour as today). (starting with 3.7.0)\"},\"properties13\":{\"name\":\"showtime\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): If set to true and translateformat is true, the language key DATE_FORMAT_CALENDAR_DATETIME is used, otherwise DATE_FORMAT_CALENDAR_DATE. (starting with 3.7.0)\"},\"properties14\":{\"name\":\"timeformat\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): can be set to 12 (and specify AM or PM) or 24 (starting with 3.7.0)\"},\"properties15\":{\"name\":\"singleheader\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): if set to false, the year and the month selection will be set on two separates lines, with independant selection (starting with 3.7.0)\"},\"properties16\":{\"name\":\"todaybutton\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): if set to true, a button is added at the bottom of the datePicker to select the date of the current day (starting with 3.7.0)\"},\"properties17\":{\"name\":\"weeknumbers\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): if set to true, a column is added at the left of the datePicker to display the number of the week in the current year (starting with 3.7.0)\"},\"properties18\":{\"name\":\"filltable\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): if set to true, dates of the previous and next month is added at the top and the bottom of the current month to fill the grid (starting with 3.7.0)\"},\"properties19\":{\"name\":\"minyear\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): set a signed integer for a number of years (-10, -2, 0, 7, 12, ...) to define the relative lower limit for the year selection. The user could not select a year before your limit (starting with 3.7.0)\"},\"properties20\":{\"name\":\"maxyear\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): set a signed integer for a number of years (-10, -2, 0, 7, 12, ...) to define the relative upper limit for the year selection. The user could not select a year after your limit (starting with 3.7.0)\"}}', 'provides a text box for entry of a date. An icon next to the text box provides a link to a pop-up calendar, which can also be used to enter the date value.', '', 1, 5, '', ''),
-(2, '', 'The category form field type provides a drop down list of all published categories for a certain extension. If the parameter has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected. If the show_root', 'Category', '{\"properties0\":{\"name\":\"type\",\"example\":\"category\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be category.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mycategory\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a category\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"extension\",\"example\":\"com_content\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the name of the extension for which the categories will be retrieved. For example, to list content categories, use the value \'com_content\'. You can add also target one view, use the value \'com_component.view\'.\"},\"properties4\":{\"name\":\"scope\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is an alias for extension.\"},\"properties5\":{\"name\":\"required\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"show_root\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether a choice representing the root category will be shown.\"},\"properties7\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default category ID number.\"},\"properties8\":{\"name\":\"description\",\"example\":\"select one of the following categories\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties9\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties10\":{\"name\":\"published\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"(optional) (1\\/0\\/2\\/-2) is whether the drop down will show only published (1), unpublished (0), archived (2) or trashed (-2) categories. It is possible to combine different publishing status by entering the list of the corresponding numbers separated by comma (e.g. \\\"0,2,-2\\\" will display only unpublished, archived and trashed categories in the drop-down).\"},\"properties11\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'provides a drop down list of categories for an extension.', '', 1, 6, '', ''),
+(2, '', 'The category form field type provides a drop down list of all published categories for a certain extension. If the parameter has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected. If the show_root', 'Category', '{\"properties0\":{\"name\":\"type\",\"example\":\"category\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be category.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mycategory\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a category\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"extension\",\"example\":\"com_content\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the name of the extension for which the categories will be retrieved. For example, to list content categories, use the value \'com_content\'. You can add also target one view, use the value \'com_component.view\'.\"},\"properties4\":{\"name\":\"scope\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is an alias for extension.\"},\"properties5\":{\"name\":\"required\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"show_root\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) is whether a choice representing the root category will be shown. Remove completely if it is not to be shown.\"},\"properties7\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default category ID number.\"},\"properties8\":{\"name\":\"description\",\"example\":\"select one of the following categories\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties9\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties10\":{\"name\":\"published\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"(optional) (1\\/0\\/2\\/-2) is whether the drop down will show only published (1), unpublished (0), archived (2) or trashed (-2) categories. It is possible to combine different publishing status by entering the list of the corresponding numbers separated by comma (e.g. \\\"0,2,-2\\\" will display only unpublished, archived and trashed categories in the drop-down).\"},\"properties11\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'provides a drop down list of categories for an extension.', '', 1, 10, '', ''),
 (3, '', 'The checkbox form field type provides a single checkbox. If the parameter has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Checkbox', '{\"properties0\":{\"name\":\"type\",\"example\":\"checkbox\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be checkbox\"},\"properties1\":{\"name\":\"name\",\"example\":\"show_title\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Show title\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"value\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"(optional) is the value of the parameter if this checkbox is set (usually 1).\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default value (usually 0 or 1).\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"description\",\"example\":\"Show the title of the item\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties7\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties8\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"},\"properties9\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (JavaScript use)\"}}', 'provides a single checkbox to be checked or unchecked', '', 1, 6, '', ''),
 (4, '', 'The checkboxes form field type provides a set of checkboxes. Note: unlike most standard form field types, such as textfield or checkbox, this field is not an \"out of the box\" solution. It will create checkboxes for you, and submit their values in form of ', 'Checkboxes', '{\"properties0\":{\"name\":\"type\",\"example\":\"checkboxes\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be checkboxs\"},\"properties1\":{\"name\":\"name\",\"example\":\"toppings\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select Toppings\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"option\",\"example\":\"anch|Anchovies,chor|Chorizo,on|Onions,mush|Mushrooms\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\"},\"properties4\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the default value.\"},\"properties5\":{\"name\":\"description\",\"example\":\"Select the topping of your choice\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties6\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties8\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'provides unlimited checkboxes that can be used for multi-select.', '', 1, 3, '', ''),
 (5, '', 'Provides a color picker. Enter the color as #ff00ff or pick it from the palet.', 'Color', '{\"properties0\":{\"name\":\"type\",\"example\":\"color\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be color.\"},\"properties1\":{\"name\":\"name\",\"example\":\"backgroundcolor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"default\",\"example\":\"#FFFFFF\",\"adjustable\":\"1\",\"description\":\"(optional) provides a color when not set.\"},\"properties3\":{\"name\":\"label\",\"example\":\"Background\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties4\":{\"name\":\"description\",\"example\":\"Select the background color here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) tooltip for the form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties6\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'provides a color picker when clicking the input box.', '', 1, 4, '', ''),
-(6, '', 'The list form field type provides a drop down list or a list box of other current component table entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Custom', '{\"properties0\":{\"name\":\"type\",\"example\":\"subjects\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type.\"},\"properties1\":{\"name\":\"name\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a Subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties7\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties8\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties9\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties10\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties11\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"},\"properties13\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties14\":{\"name\":\"extends\",\"example\":\"list\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties15\":{\"name\":\"button\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) to add new button next to field in edit view\"},\"properties16\":{\"name\":\"table\",\"example\":\"#__###component###_subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. The ###TABLE### placeholder holds the table in the php.\"},\"properties17\":{\"name\":\"component\",\"example\":\"com_###component###\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties18\":{\"name\":\"view\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties19\":{\"name\":\"views\",\"example\":\"subjects\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties20\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to. The ###TEXT### placeholder holds the value_field in the php.\"},\"properties21\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key. The ###ID### placeholder holds the key_field in the php.\"},\"properties22\":{\"name\":\"prime_php\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"This field makes sure that the PHP used here is used to build the field type, and other are custom fields with the same field type are ignored. So to avoid that they over write the PHP added here. You should only have one prime per\\/type. To disable remove the field or set to 0\"},\"properties23\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ Get the user object.\\r\\n\\t\\t$user = JFactory::getUser();\\r\\n\\t\\t\\/\\/ Get the databse object.\\r\\n\\t\\t$db = JFactory::getDBO();\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t$query->select($db->quoteName(array(\'a.###ID###\',\'a.###TEXT###\'),array(\'###ID###\',\'###CODE_TEXT###\')));\\r\\n\\t\\t$query->from($db->quoteName(\'###TABLE###\', \'a\'));\\r\\n\\t\\t$query->where($db->quoteName(\'a.published\') . \' = 1\');\\r\\n\\t\\t$query->order(\'a.###TEXT### ASC\');\\r\\n\\t\\t\\/\\/ Implement View Level Access (if set in table)\\r\\n\\t\\tif (!$user->authorise(\'core.options\', \'[[[com_component]]]\'))\\r\\n\\t\\t{\\r\\n\\t\\t\\t$columns = $db->getTableColumns(\'###TABLE###\');\\r\\n\\t\\t\\tif(isset($columns[\'access\']))\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$groups = implode(\',\', $user->getAuthorisedViewLevels());\\r\\n\\t\\t\\t\\t$query->where(\'a.access IN (\' . $groups . \')\');\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\t$db->setQuery((string)$query);\\r\\n\\t\\t$items = $db->loadObjectList();\\r\\n\\t\\t$options = array();\\r\\n\\t\\tif ($items)\\r\\n\\t\\t{\\r\\n\\t\\t\\t$options[] = JHtml::_(\'select.option\', \'\', \'Select an option\');\\r\\n\\t\\t\\tforeach($items as $item)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = JHtml::_(\'select.option\', $item->###ID###, $item->###CODE_TEXT###);\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\treturn $options;\",\"adjustable\":\"1\",\"description\":\"The php for the getOptions method.\"}}', 'provides a drop down list of items entries.', '', 1, 22, '', ''),
+(6, '', 'The list form field type provides a drop down list or a list box of other current component table entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Custom', '{\"properties0\":{\"name\":\"type\",\"example\":\"subjects\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type. You can also not use the \\\"_\\\" (underscore) or \\\"-\\\" (hyphen) in the type name, and no spaces.\"},\"properties1\":{\"name\":\"name\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select a Subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties5\":{\"name\":\"class\",\"example\":\"list_class\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties7\":{\"name\":\"default\",\"example\":\"0\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties8\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties9\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties10\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties11\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties12\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"},\"properties13\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"},\"properties14\":{\"name\":\"extends\",\"example\":\"list\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties15\":{\"name\":\"button\",\"example\":\"true\",\"adjustable\":\"1\",\"description\":\"(optional) to add new button next to field in edit view\"},\"properties16\":{\"name\":\"table\",\"example\":\"#__###component###_subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. The ###TABLE### placeholder holds the table in the php.\"},\"properties17\":{\"name\":\"component\",\"example\":\"com_###component###\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties18\":{\"name\":\"view\",\"example\":\"subject\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties19\":{\"name\":\"views\",\"example\":\"subjects\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties20\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to. The ###TEXT### placeholder holds the value_field in the php.\"},\"properties21\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key. The ###ID### placeholder holds the key_field in the php.\"},\"properties22\":{\"name\":\"prime_php\",\"example\":\"1\",\"adjustable\":\"1\",\"description\":\"This field makes sure that the PHP used here is used to build the field type, and other are custom fields with the same field type are ignored. So to avoid that they over write the PHP added here. You should only have one prime per\\/type. To disable remove the field or set to 0\"},\"properties23\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ Get the user object.\\r\\n\\t\\t$user = JFactory::getUser();\\r\\n\\t\\t\\/\\/ Get the databse object.\\r\\n\\t\\t$db = JFactory::getDBO();\\r\\n\\t\\t$query = $db->getQuery(true);\\r\\n\\t\\t$query->select($db->quoteName(array(\'a.###ID###\',\'a.###TEXT###\'),array(\'###ID###\',\'###CODE_TEXT###\')));\\r\\n\\t\\t$query->from($db->quoteName(\'###TABLE###\', \'a\'));\\r\\n\\t\\t$query->where($db->quoteName(\'a.published\') . \' = 1\');\\r\\n\\t\\t$query->order(\'a.###TEXT### ASC\');\\r\\n\\t\\t\\/\\/ Implement View Level Access (if set in table)\\r\\n\\t\\tif (!$user->authorise(\'core.options\', \'[[[com_component]]]\'))\\r\\n\\t\\t{\\r\\n\\t\\t\\t$columns = $db->getTableColumns(\'###TABLE###\');\\r\\n\\t\\t\\tif(isset($columns[\'access\']))\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$groups = implode(\',\', $user->getAuthorisedViewLevels());\\r\\n\\t\\t\\t\\t$query->where(\'a.access IN (\' . $groups . \')\');\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\t$db->setQuery((string)$query);\\r\\n\\t\\t$items = $db->loadObjectList();\\r\\n\\t\\t$options = array();\\r\\n\\t\\tif ($items)\\r\\n\\t\\t{\\r\\n\\t\\t\\t$options[] = JHtml::_(\'select.option\', \'\', \'Select an option\');\\r\\n\\t\\t\\tforeach($items as $item)\\r\\n\\t\\t\\t{\\r\\n\\t\\t\\t\\t$options[] = JHtml::_(\'select.option\', $item->###ID###, $item->###CODE_TEXT###);\\r\\n\\t\\t\\t}\\r\\n\\t\\t}\\r\\n\\t\\treturn $options;\",\"adjustable\":\"1\",\"description\":\"The php for the getOptions method.\"}}', 'provides a drop down list of items entries.', '', 1, 24, '', ''),
 (7, '', 'The a list of users that can be targeting one or more groups and excluded users that already belongs to an item in a view.', 'CustomUser', '{\"properties0\":{\"name\":\"type\",\"example\":\"staffusers\",\"mandatory\":\"1\",\"description\":\"(mandatory) can be anything, just not the same as any other default Joomla field type.\"},\"properties1\":{\"name\":\"name\",\"example\":\"staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Staff\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\"},\"properties5\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties6\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties7\":{\"name\":\"readonly\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties8\":{\"name\":\"disabled\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties9\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties10\":{\"name\":\"hint\",\"example\":\"select a user\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"\"},\"properties11\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"},\"properties12\":{\"name\":\"extends\",\"example\":\"user\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"The JFormField sub class that should be extended. The options are (\'list\',\'radio\',\'checkboxes\')\"},\"properties13\":{\"name\":\"table\",\"example\":\"#__users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The table being linked to. Must be #__users\"},\"properties14\":{\"name\":\"component\",\"example\":\"com_users\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the component where this table is found. Must be com_users\"},\"properties15\":{\"name\":\"view\",\"example\":\"###view###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The single view name if the place this field is added.\"},\"properties16\":{\"name\":\"views\",\"example\":\"###views###\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The list view name if the place this field is added.\"},\"properties17\":{\"name\":\"value_field\",\"example\":\"name\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The name of the text field in table linked to.\"},\"properties18\":{\"name\":\"key_field\",\"example\":\"id\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The field from the linked table to save in this table as the unique key.\"},\"properties19\":{\"name\":\"type_php_1\",\"example\":\"\\/\\/ set the groups array\",\"adjustable\":\"1\",\"description\":\"The php for the getGroups method.\"},\"properties20\":{\"name\":\"type_php_2\",\"example\":\"$groups = JComponentHelper::getParams(\'com_###component###\')->get(\'###type###\');\",\"adjustable\":\"1\",\"description\":\"The php for the getGroups method.\"},\"properties21\":{\"name\":\"type_php_3\",\"example\":\"return $groups;\",\"adjustable\":\"1\",\"description\":\"The php for the getGroups method.\"},\"properties22\":{\"name\":\"type_phpx_1\",\"example\":\"\\/\\/ To ensure that there is only one record per user\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties23\":{\"name\":\"type_phpx_2\",\"example\":\"\\/\\/ Get a db connection.\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties24\":{\"name\":\"type_phpx_3\",\"example\":\"$db = JFactory::getDbo();\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties25\":{\"name\":\"type_phpx_4\",\"example\":\"\\/\\/ Create a new query object.\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties26\":{\"name\":\"type_phpx_5\",\"example\":\"$query = $db->getQuery(true);\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties27\":{\"name\":\"type_phpx_6\",\"example\":\"\\/\\/ Select all records from the #__###component###_###view### table from ###CODE### column\\\".\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties28\":{\"name\":\"type_phpx_7\",\"example\":\"$query->select($db->quoteName(\'###CODE###\'));\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties29\":{\"name\":\"type_phpx_8\",\"example\":\"$query->from($db->quoteName(\'#__###component###_###view###\'));\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties30\":{\"name\":\"type_phpx_9\",\"example\":\"$db->setQuery($query);\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties31\":{\"name\":\"type_phpx_10\",\"example\":\"$db->execute();\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties32\":{\"name\":\"type_phpx_11\",\"example\":\"$found = $db->getNumRows();\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties33\":{\"name\":\"type_phpx_12\",\"example\":\"if ($found)\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties34\":{\"name\":\"type_phpx_13\",\"example\":\"{\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties35\":{\"name\":\"type_phpx_14\",\"example\":\"\\\\t\\/\\/ return all users already used\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties36\":{\"name\":\"type_phpx_15\",\"example\":\"\\\\treturn array_unique($db->loadColumn());\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties37\":{\"name\":\"type_phpx_16\",\"example\":\"}\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"},\"properties38\":{\"name\":\"type_phpx_17\",\"example\":\"return null;\",\"adjustable\":\"1\",\"description\":\"The php for the getExcluded method.\"}}', 'Provides list of users.', '', 1, 4, '', ''),
 (8, '', 'The Editor field type provides a WYSIWYG editor.', 'Editor', '{\"properties0\":{\"name\":\"type\",\"example\":\"editor\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editor.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mytextblock\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Test Field\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"Some text\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"message\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as error on validation.\"},\"properties6\":{\"name\":\"width\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width (in pixels) of the wysiwyg editor and defaults to 100%.\"},\"properties7\":{\"name\":\"height\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height (in pixels) of the wysiwyg editor and defaults to 250px.\"},\"properties8\":{\"name\":\"cols\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the width of the editor (in columns).\"},\"properties9\":{\"name\":\"rows\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) defines the height of the editor (in rows).\"},\"properties10\":{\"name\":\"buttons\",\"example\":\"no\",\"adjustable\":\"1\",\"description\":\"(optional) can be an array of plugin buttons to be excluded or set to false. The default editors-xtd are: article, image, pagebreak and readmore.\"},\"properties11\":{\"name\":\"syntax\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) can be used to set the code syntax matching for this field.\"},\"properties12\":{\"name\":\"hide\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) array of plugin buttons to be hidden. eg... set buttons=\\\"true\\\" hide=\\\"readmore,pagebreak\\\"\"},\"properties13\":{\"name\":\"editor\",\"example\":\"codemirror|none\",\"adjustable\":\"1\",\"description\":\"specifies the editor to be used and can include two options (editor=\\\"desired|alternative\\\")\"},\"properties14\":{\"name\":\"filter\",\"example\":\"safehtml\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties15\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties16\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties17\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'provides an editor area field.', '', 1, 10, '', ''),
 (9, '', 'The hidden form field type provides a hidden field for saving a field whose value cannot be altered directly by a user in the Administrator (it can be altered in code or by editing the params.ini file). If the parameter has a saved value this is entered i', 'Hidden', '{\"properties0\":{\"name\":\"type\",\"example\":\"hidden\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be hidden.\"},\"properties1\":{\"name\":\"name\",\"example\":\"mysecretvariable\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"default\",\"example\":\"1\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the data which needs to be collected.\"},\"properties5\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties4\":{\"name\":\"validate\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"}}', 'provides a hidden field for saving a form field whose value cannot be altered directly by a user.', '', 1, 2, '', ''),
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index 64dbd24df..3fd6a7d6b 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -195,7 +195,7 @@ class ComponentbuilderViewFields extends JViewLegacy
 		JHtmlSidebar::addFilter(
 			JText::_('JOPTION_SELECT_CATEGORY'),
 			'filter_category_id',
-			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fields'), 'value', 'text', $this->state->get('filter.category_id'))
+			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.field'), 'value', 'text', $this->state->get('filter.category_id'))
 		);
 
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
@@ -204,7 +204,7 @@ class ComponentbuilderViewFields extends JViewLegacy
 			JHtmlBatch_::addListSelection(
 				JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY'),
 				'batch[category]',
-				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fields'), 'value', 'text')
+				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.field'), 'value', 'text')
 			);
 		}
 
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index 683e0e33f..defc9c4e6 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -190,7 +190,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
 		JHtmlSidebar::addFilter(
 			JText::_('JOPTION_SELECT_CATEGORY'),
 			'filter_category_id',
-			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtypes'), 'value', 'text', $this->state->get('filter.category_id'))
+			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtype'), 'value', 'text', $this->state->get('filter.category_id'))
 		);
 
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
@@ -199,7 +199,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
 			JHtmlBatch_::addListSelection(
 				JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY'),
 				'batch[category]',
-				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtypes'), 'value', 'text')
+				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtype'), 'value', 'text')
 			);
 		}
 	}
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 1ce7f81cf..49d873d22 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>25th May, 2019</creationDate>
+	<creationDate>5th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/site/controllers/api.php b/site/controllers/api.php
index ed3e51879..261cb8999 100644
--- a/site/controllers/api.php
+++ b/site/controllers/api.php
@@ -266,7 +266,7 @@ class ComponentbuilderControllerApi extends JControllerForm
 		// make sure to set active type (adding this script from custom code :)
 		$model->activeType = 'backup';
 		// check if export is allowed for this user. (we need this sorry)
-		if ($model->user->authorise('joomla_component.export', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
+		if ($model->user->authorise('joomla_component.export_jcb_packages', 'com_componentbuilder') && $model->user->authorise('core.export', 'com_componentbuilder'))
 		{
 			// get all component IDs to backup
 			$pks = componentbuilderHelper::getComponentIDs();
-- 
2.40.1


From e1f32c142be517326d6a1d3976252d57c010421f Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 5 Jun 2019 12:50:42 +0200
Subject: [PATCH 08/26] Fixed filter to not display 'Select an option' but the
 field name instead

---
 README.md                                    |  2 +-
 admin/README.txt                             |  2 +-
 admin/helpers/compiler/e_Interpretation.php  | 12 ++++++++++
 admin/views/admin_views/view.html.php        | 25 ++++++++++++++++++++
 admin/views/custom_admin_views/view.html.php | 15 ++++++++++++
 admin/views/custom_codes/view.html.php       | 20 ++++++++++++++++
 admin/views/dynamic_gets/view.html.php       | 10 ++++++++
 admin/views/fields/view.html.php             | 25 ++++++++++++++++++++
 admin/views/help_documents/view.html.php     | 20 ++++++++++++++++
 admin/views/joomla_components/view.html.php  | 10 ++++++++
 admin/views/layouts/view.html.php            | 10 ++++++++
 admin/views/libraries/view.html.php          | 10 ++++++++
 admin/views/servers/view.html.php            | 10 ++++++++
 admin/views/site_views/view.html.php         | 15 ++++++++++++
 admin/views/snippets/view.html.php           | 10 ++++++++
 admin/views/templates/view.html.php          | 10 ++++++++
 16 files changed, 204 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f3ce4550c..51a1eca66 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206365**
++ *Line count*: **206555**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index f3ce4550c..51a1eca66 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206365**
++ *Line count*: **206555**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index eec7d570d..88acd3488 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10854,6 +10854,8 @@ class Interpretation extends Fields
 	{
 		if (isset($this->filterBuilder[$view]) && ComponentbuilderHelper::checkArray($this->filterBuilder[$view]))
 		{
+			// get component name
+			$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
 			$otherFilter = array();
 			foreach ($this->filterBuilder[$view] as $filter)
 			{
@@ -10866,6 +10868,11 @@ class Interpretation extends Fields
 					$otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;";
 					$otherFilter[] = $this->_t(2) . "if (\$this->" . $codeName . "Options)";
 					$otherFilter[] = $this->_t(2) . "{";
+					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
+					$otherFilter[] = $this->_t(3) . "if (isset(\$this->" . $codeName . "Options[0]) && !" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))";
+					$otherFilter[] = $this->_t(3) . "{";
+					$otherFilter[] = $this->_t(4) . "unset(\$this->" . $codeName . "Options[0]);";
+					$otherFilter[] = $this->_t(3) . "}";
 					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter";
 					$otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
 					$otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',";
@@ -10900,6 +10907,11 @@ class Interpretation extends Fields
 					$otherFilter[] = $this->_t(2) . "\$this->" . $filter['code'] . "Options = " . $functionName;
 					$otherFilter[] = $this->_t(2) . "if (\$this->" . $filter['code'] . "Options)";
 					$otherFilter[] = $this->_t(2) . "{";
+					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
+					$otherFilter[] = $this->_t(3) . "if (isset(\$this->" . $filter['code'] . "Options[0]) && !" . $Component . "Helper::checkString(\$this->" . $filter['code'] . "Options[0]->value))";
+					$otherFilter[] = $this->_t(3) . "{";
+					$otherFilter[] = $this->_t(4) . "unset(\$this->" . $filter['code'] . "Options[0]);";
+					$otherFilter[] = $this->_t(3) . "}";
 					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $Codename . " Filter";
 					$otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
 					$otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',";
diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php
index fa4c172f9..62e27a410 100644
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->add_fadeinOptions = $this->getTheAdd_fadeinSelections();
 		if ($this->add_fadeinOptions)
 		{
+			// We do some sanitation for Add Fadein filter
+			if (isset($this->add_fadeinOptions[0]) && !ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value))
+			{
+				unset($this->add_fadeinOptions[0]);
+			}
 			// Add Fadein Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
+			// We do some sanitation for Type filter
+			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+			{
+				unset($this->typeOptions[0]);
+			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
@@ -239,6 +249,11 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
 		if ($this->add_custom_importOptions)
 		{
+			// We do some sanitation for Add Custom Import filter
+			if (isset($this->add_custom_importOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value))
+			{
+				unset($this->add_custom_importOptions[0]);
+			}
 			// Add Custom Import Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
@@ -261,6 +276,11 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
 		if ($this->add_custom_buttonOptions)
 		{
+			// We do some sanitation for Add Custom Button filter
+			if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
+			{
+				unset($this->add_custom_buttonOptions[0]);
+			}
 			// Add Custom Button Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
@@ -283,6 +303,11 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
 		if ($this->add_php_ajaxOptions)
 		{
+			// We do some sanitation for Add Php Ajax filter
+			if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
+			{
+				unset($this->add_php_ajaxOptions[0]);
+			}
 			// Add Php Ajax Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 766ece13e..04072c852 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 		$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
 		if ($this->main_getNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
+			{
+				unset($this->main_getNameOptions[0]);
+			}
 			// Main Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
 		if ($this->add_php_ajaxOptions)
 		{
+			// We do some sanitation for Add Php Ajax filter
+			if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
+			{
+				unset($this->add_php_ajaxOptions[0]);
+			}
 			// Add Php Ajax Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',
@@ -239,6 +249,11 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
 		if ($this->add_custom_buttonOptions)
 		{
+			// We do some sanitation for Add Custom Button filter
+			if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
+			{
+				unset($this->add_custom_buttonOptions[0]);
+			}
 			// Add Custom Button Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index bab1ad5e3..729900b2e 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 		$this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options;
 		if ($this->componentSystem_nameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->componentSystem_nameOptions[0]) && !ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
+			{
+				unset($this->componentSystem_nameOptions[0]);
+			}
 			// Component System Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 		$this->targetOptions = $this->getTheTargetSelections();
 		if ($this->targetOptions)
 		{
+			// We do some sanitation for Target filter
+			if (isset($this->targetOptions[0]) && !ComponentbuilderHelper::checkString($this->targetOptions[0]->value))
+			{
+				unset($this->targetOptions[0]);
+			}
 			// Target Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -',
@@ -239,6 +249,11 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
+			// We do some sanitation for Type filter
+			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+			{
+				unset($this->typeOptions[0]);
+			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL').' -',
@@ -261,6 +276,11 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 		$this->comment_typeOptions = $this->getTheComment_typeSelections();
 		if ($this->comment_typeOptions)
 		{
+			// We do some sanitation for Comment Type filter
+			if (isset($this->comment_typeOptions[0]) && !ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value))
+			{
+				unset($this->comment_typeOptions[0]);
+			}
 			// Comment Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index 503b3f647..1ab2ae334 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 		$this->main_sourceOptions = $this->getTheMain_sourceSelections();
 		if ($this->main_sourceOptions)
 		{
+			// We do some sanitation for Main Source filter
+			if (isset($this->main_sourceOptions[0]) && !ComponentbuilderHelper::checkString($this->main_sourceOptions[0]->value))
+			{
+				unset($this->main_sourceOptions[0]);
+			}
 			// Main Source Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 		$this->gettypeOptions = $this->getTheGettypeSelections();
 		if ($this->gettypeOptions)
 		{
+			// We do some sanitation for Gettype filter
+			if (isset($this->gettypeOptions[0]) && !ComponentbuilderHelper::checkString($this->gettypeOptions[0]->value))
+			{
+				unset($this->gettypeOptions[0]);
+			}
 			// Gettype Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL').' -',
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index 3fd6a7d6b..596391e67 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -212,6 +212,11 @@ class ComponentbuilderViewFields extends JViewLegacy
 		$this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options;
 		if ($this->fieldtypeNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->fieldtypeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value))
+			{
+				unset($this->fieldtypeNameOptions[0]);
+			}
 			// Fieldtype Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL').' -',
@@ -234,6 +239,11 @@ class ComponentbuilderViewFields extends JViewLegacy
 		$this->datatypeOptions = $this->getTheDatatypeSelections();
 		if ($this->datatypeOptions)
 		{
+			// We do some sanitation for Datatype filter
+			if (isset($this->datatypeOptions[0]) && !ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value))
+			{
+				unset($this->datatypeOptions[0]);
+			}
 			// Datatype Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL').' -',
@@ -256,6 +266,11 @@ class ComponentbuilderViewFields extends JViewLegacy
 		$this->indexesOptions = $this->getTheIndexesSelections();
 		if ($this->indexesOptions)
 		{
+			// We do some sanitation for Indexes filter
+			if (isset($this->indexesOptions[0]) && !ComponentbuilderHelper::checkString($this->indexesOptions[0]->value))
+			{
+				unset($this->indexesOptions[0]);
+			}
 			// Indexes Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL').' -',
@@ -278,6 +293,11 @@ class ComponentbuilderViewFields extends JViewLegacy
 		$this->null_switchOptions = $this->getTheNull_switchSelections();
 		if ($this->null_switchOptions)
 		{
+			// We do some sanitation for Null Switch filter
+			if (isset($this->null_switchOptions[0]) && !ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value))
+			{
+				unset($this->null_switchOptions[0]);
+			}
 			// Null Switch Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL').' -',
@@ -300,6 +320,11 @@ class ComponentbuilderViewFields extends JViewLegacy
 		$this->storeOptions = $this->getTheStoreSelections();
 		if ($this->storeOptions)
 		{
+			// We do some sanitation for Store filter
+			if (isset($this->storeOptions[0]) && !ComponentbuilderHelper::checkString($this->storeOptions[0]->value))
+			{
+				unset($this->storeOptions[0]);
+			}
 			// Store Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL').' -',
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 51a425e54..5f93a83e5 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -190,6 +190,11 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
+			// We do some sanitation for Type filter
+			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+			{
+				unset($this->typeOptions[0]);
+			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL').' -',
@@ -212,6 +217,11 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 		$this->locationOptions = $this->getTheLocationSelections();
 		if ($this->locationOptions)
 		{
+			// We do some sanitation for Location filter
+			if (isset($this->locationOptions[0]) && !ComponentbuilderHelper::checkString($this->locationOptions[0]->value))
+			{
+				unset($this->locationOptions[0]);
+			}
 			// Location Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL').' -',
@@ -234,6 +244,11 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 		$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
 		if ($this->admin_viewOptions)
 		{
+			// We do some sanitation for Location filter
+			if (isset($this->admin_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value))
+			{
+				unset($this->admin_viewOptions[0]);
+			}
 			// Admin View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -',
@@ -256,6 +271,11 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 		$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
 		if ($this->site_viewOptions)
 		{
+			// We do some sanitation for Location filter
+			if (isset($this->site_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value))
+			{
+				unset($this->site_viewOptions[0]);
+			}
 			// Site View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL').' -',
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index 93cf071ec..f417b0619 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -220,6 +220,11 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
 		$this->companynameOptions = $this->getTheCompanynameSelections();
 		if ($this->companynameOptions)
 		{
+			// We do some sanitation for Companyname filter
+			if (isset($this->companynameOptions[0]) && !ComponentbuilderHelper::checkString($this->companynameOptions[0]->value))
+			{
+				unset($this->companynameOptions[0]);
+			}
 			// Companyname Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL').' -',
@@ -242,6 +247,11 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
 		$this->authorOptions = $this->getTheAuthorSelections();
 		if ($this->authorOptions)
 		{
+			// We do some sanitation for Author filter
+			if (isset($this->authorOptions[0]) && !ComponentbuilderHelper::checkString($this->authorOptions[0]->value))
+			{
+				unset($this->authorOptions[0]);
+			}
 			// Author Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL').' -',
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index 60c57883f..b15874800 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewLayouts extends JViewLegacy
 		$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
 		if ($this->dynamic_getNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->dynamic_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
+			{
+				unset($this->dynamic_getNameOptions[0]);
+			}
 			// Dynamic Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewLayouts extends JViewLegacy
 		$this->add_php_viewOptions = $this->getTheAdd_php_viewSelections();
 		if ($this->add_php_viewOptions)
 		{
+			// We do some sanitation for Add Php View filter
+			if (isset($this->add_php_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
+			{
+				unset($this->add_php_viewOptions[0]);
+			}
 			// Add Php View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW_LABEL').' -',
diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php
index c3f1e70fd..9a4d5fd39 100644
--- a/admin/views/libraries/view.html.php
+++ b/admin/views/libraries/view.html.php
@@ -185,6 +185,11 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 		$this->howOptions = JFormHelper::loadFieldType('Filebehaviour')->options;
 		if ($this->howOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->howOptions[0]) && !ComponentbuilderHelper::checkString($this->howOptions[0]->value))
+			{
+				unset($this->howOptions[0]);
+			}
 			// How Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL').' -',
@@ -207,6 +212,11 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 		$this->typeOptions = $this->getTheTypeSelections();
 		if ($this->typeOptions)
 		{
+			// We do some sanitation for Type filter
+			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+			{
+				unset($this->typeOptions[0]);
+			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL').' -',
diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php
index 809c5ec7b..005fa8a8c 100644
--- a/admin/views/servers/view.html.php
+++ b/admin/views/servers/view.html.php
@@ -190,6 +190,11 @@ class ComponentbuilderViewServers extends JViewLegacy
 		$this->nameOptions = $this->getTheNameSelections();
 		if ($this->nameOptions)
 		{
+			// We do some sanitation for Name filter
+			if (isset($this->nameOptions[0]) && !ComponentbuilderHelper::checkString($this->nameOptions[0]->value))
+			{
+				unset($this->nameOptions[0]);
+			}
 			// Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_NAME_LABEL').' -',
@@ -212,6 +217,11 @@ class ComponentbuilderViewServers extends JViewLegacy
 		$this->protocolOptions = $this->getTheProtocolSelections();
 		if ($this->protocolOptions)
 		{
+			// We do some sanitation for Protocol filter
+			if (isset($this->protocolOptions[0]) && !ComponentbuilderHelper::checkString($this->protocolOptions[0]->value))
+			{
+				unset($this->protocolOptions[0]);
+			}
 			// Protocol Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL').' -',
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index f9227b938..f71087da6 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 		$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
 		if ($this->main_getNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
+			{
+				unset($this->main_getNameOptions[0]);
+			}
 			// Main Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
 		if ($this->add_php_ajaxOptions)
 		{
+			// We do some sanitation for Add Php Ajax filter
+			if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
+			{
+				unset($this->add_php_ajaxOptions[0]);
+			}
 			// Add Php Ajax Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL').' -',
@@ -239,6 +249,11 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
 		if ($this->add_custom_buttonOptions)
 		{
+			// We do some sanitation for Add Custom Button filter
+			if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
+			{
+				unset($this->add_custom_buttonOptions[0]);
+			}
 			// Add Custom Button Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index 5cea48555..a85326ec8 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -200,6 +200,11 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 		$this->typeNameOptions = JFormHelper::loadFieldType('Snippettype')->options;
 		if ($this->typeNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->typeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
+			{
+				unset($this->typeNameOptions[0]);
+			}
 			// Type Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL').' -',
@@ -222,6 +227,11 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 		$this->libraryNameOptions = JFormHelper::loadFieldType('Library')->options;
 		if ($this->libraryNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->libraryNameOptions[0]) && !ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
+			{
+				unset($this->libraryNameOptions[0]);
+			}
 			// Library Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL').' -',
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index d77add504..09651d2d3 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -195,6 +195,11 @@ class ComponentbuilderViewTemplates extends JViewLegacy
 		$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
 		if ($this->dynamic_getNameOptions)
 		{
+			// We do some sanitation for  filter
+			if (isset($this->dynamic_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
+			{
+				unset($this->dynamic_getNameOptions[0]);
+			}
 			// Dynamic Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_LABEL').' -',
@@ -217,6 +222,11 @@ class ComponentbuilderViewTemplates extends JViewLegacy
 		$this->add_php_viewOptions = $this->getTheAdd_php_viewSelections();
 		if ($this->add_php_viewOptions)
 		{
+			// We do some sanitation for Add Php View filter
+			if (isset($this->add_php_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
+			{
+				unset($this->add_php_viewOptions[0]);
+			}
 			// Add Php View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL').' -',
-- 
2.40.1


From 4a878e32ef5ffb3c1b5b6084df4abda0dddd8986 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 5 Jun 2019 13:14:05 +0200
Subject: [PATCH 09/26] Moved the filter sanitation to insure no empty filters
 will get loaded

---
 README.md                                    |  2 +-
 admin/README.txt                             |  2 +-
 admin/helpers/compiler/e_Interpretation.php  | 30 ++++----
 admin/views/admin_views/view.html.php        | 75 ++++++++++++--------
 admin/views/custom_admin_views/view.html.php | 45 +++++++-----
 admin/views/custom_codes/view.html.php       | 60 +++++++++-------
 admin/views/dynamic_gets/view.html.php       | 30 ++++----
 admin/views/fields/view.html.php             | 75 ++++++++++++--------
 admin/views/help_documents/view.html.php     | 60 +++++++++-------
 admin/views/joomla_components/view.html.php  | 30 ++++----
 admin/views/layouts/view.html.php            | 30 ++++----
 admin/views/libraries/view.html.php          | 30 ++++----
 admin/views/servers/view.html.php            | 30 ++++----
 admin/views/site_views/view.html.php         | 45 +++++++-----
 admin/views/snippets/view.html.php           | 30 ++++----
 admin/views/templates/view.html.php          | 30 ++++----
 16 files changed, 362 insertions(+), 242 deletions(-)

diff --git a/README.md b/README.md
index 51a1eca66..31233e8df 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206555**
++ *Line count*: **206669**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 51a1eca66..31233e8df 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206555**
++ *Line count*: **206669**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 88acd3488..f80750831 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10866,13 +10866,16 @@ class Interpretation extends Fields
 					$type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F');
 					$otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection";
 					$otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;";
-					$otherFilter[] = $this->_t(2) . "if (\$this->" . $codeName . "Options)";
+					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
+					$otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options) &&";
+					$otherFilter[] = $this->_t(3) . "isset(\$this->" . $codeName . "Options[0]->value) &&";
+					$otherFilter[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))";
+					$otherFilter[] = $this->_t(2) . "{";
+					$otherFilter[] = $this->_t(3) . "unset(\$this->" . $codeName . "Options[0]);";
+					$otherFilter[] = $this->_t(2) . "}";
+					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load " . $Codename . " filter if it has values";
+					$otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options))";
 					$otherFilter[] = $this->_t(2) . "{";
-					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
-					$otherFilter[] = $this->_t(3) . "if (isset(\$this->" . $codeName . "Options[0]) && !" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))";
-					$otherFilter[] = $this->_t(3) . "{";
-					$otherFilter[] = $this->_t(4) . "unset(\$this->" . $codeName . "Options[0]);";
-					$otherFilter[] = $this->_t(3) . "}";
 					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter";
 					$otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
 					$otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',";
@@ -10905,13 +10908,16 @@ class Interpretation extends Fields
 					}
 					$otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $Codename . " Selection";
 					$otherFilter[] = $this->_t(2) . "\$this->" . $filter['code'] . "Options = " . $functionName;
-					$otherFilter[] = $this->_t(2) . "if (\$this->" . $filter['code'] . "Options)";
+					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
+					$otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $filter['code'] . "Options) &&";
+					$otherFilter[] = $this->_t(3) . "isset(\$this->" . $filter['code'] . "Options[0]->value) &&";
+					$otherFilter[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $filter['code'] . "Options[0]->value))";
+					$otherFilter[] = $this->_t(2) . "{";
+					$otherFilter[] = $this->_t(3) . "unset(\$this->" . $filter['code'] . "Options[0]);";
+					$otherFilter[] = $this->_t(2) . "}";
+					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load " . $Codename . " filter if it has values";
+					$otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $filter['code'] . "Options))";
 					$otherFilter[] = $this->_t(2) . "{";
-					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
-					$otherFilter[] = $this->_t(3) . "if (isset(\$this->" . $filter['code'] . "Options[0]) && !" . $Component . "Helper::checkString(\$this->" . $filter['code'] . "Options[0]->value))";
-					$otherFilter[] = $this->_t(3) . "{";
-					$otherFilter[] = $this->_t(4) . "unset(\$this->" . $filter['code'] . "Options[0]);";
-					$otherFilter[] = $this->_t(3) . "}";
 					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $Codename . " Filter";
 					$otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter(";
 					$otherFilter[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',";
diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php
index 62e27a410..7e2f0163a 100644
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 
 		// Set Add Fadein Selection
 		$this->add_fadeinOptions = $this->getTheAdd_fadeinSelections();
-		if ($this->add_fadeinOptions)
+		// We do some sanitation for Add Fadein filter
+		if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions) &&
+			isset($this->add_fadeinOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value))
+		{
+			unset($this->add_fadeinOptions[0]);
+		}
+		// Only load Add Fadein filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions))
 		{
-			// We do some sanitation for Add Fadein filter
-			if (isset($this->add_fadeinOptions[0]) && !ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value))
-			{
-				unset($this->add_fadeinOptions[0]);
-			}
 			// Add Fadein Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 
 		// Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
-		if ($this->typeOptions)
+		// We do some sanitation for Type filter
+		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
+			isset($this->typeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+		{
+			unset($this->typeOptions[0]);
+		}
+		// Only load Type filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->typeOptions))
 		{
-			// We do some sanitation for Type filter
-			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
-			{
-				unset($this->typeOptions[0]);
-			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
@@ -247,13 +253,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 
 		// Set Add Custom Import Selection
 		$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
-		if ($this->add_custom_importOptions)
+		// We do some sanitation for Add Custom Import filter
+		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions) &&
+			isset($this->add_custom_importOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value))
+		{
+			unset($this->add_custom_importOptions[0]);
+		}
+		// Only load Add Custom Import filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions))
 		{
-			// We do some sanitation for Add Custom Import filter
-			if (isset($this->add_custom_importOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value))
-			{
-				unset($this->add_custom_importOptions[0]);
-			}
 			// Add Custom Import Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
@@ -274,13 +283,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 
 		// Set Add Custom Button Selection
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
-		if ($this->add_custom_buttonOptions)
+		// We do some sanitation for Add Custom Button filter
+		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) &&
+			isset($this->add_custom_buttonOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
+		{
+			unset($this->add_custom_buttonOptions[0]);
+		}
+		// Only load Add Custom Button filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
 		{
-			// We do some sanitation for Add Custom Button filter
-			if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
-			{
-				unset($this->add_custom_buttonOptions[0]);
-			}
 			// Add Custom Button Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
@@ -301,13 +313,16 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 
 		// Set Add Php Ajax Selection
 		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
-		if ($this->add_php_ajaxOptions)
+		// We do some sanitation for Add Php Ajax filter
+		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) &&
+			isset($this->add_php_ajaxOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
+		{
+			unset($this->add_php_ajaxOptions[0]);
+		}
+		// Only load Add Php Ajax filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
 		{
-			// We do some sanitation for Add Php Ajax filter
-			if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
-			{
-				unset($this->add_php_ajaxOptions[0]);
-			}
 			// Add Php Ajax Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 04072c852..6a846c5d6 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 
 		// Set Main Get Name Selection
 		$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
-		if ($this->main_getNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
+			isset($this->main_getNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
+		{
+			unset($this->main_getNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
-			{
-				unset($this->main_getNameOptions[0]);
-			}
 			// Main Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 
 		// Set Add Php Ajax Selection
 		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
-		if ($this->add_php_ajaxOptions)
+		// We do some sanitation for Add Php Ajax filter
+		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) &&
+			isset($this->add_php_ajaxOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
+		{
+			unset($this->add_php_ajaxOptions[0]);
+		}
+		// Only load Add Php Ajax filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
 		{
-			// We do some sanitation for Add Php Ajax filter
-			if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
-			{
-				unset($this->add_php_ajaxOptions[0]);
-			}
 			// Add Php Ajax Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',
@@ -247,13 +253,16 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 
 		// Set Add Custom Button Selection
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
-		if ($this->add_custom_buttonOptions)
+		// We do some sanitation for Add Custom Button filter
+		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) &&
+			isset($this->add_custom_buttonOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
+		{
+			unset($this->add_custom_buttonOptions[0]);
+		}
+		// Only load Add Custom Button filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
 		{
-			// We do some sanitation for Add Custom Button filter
-			if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
-			{
-				unset($this->add_custom_buttonOptions[0]);
-			}
 			// Add Custom Button Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index 729900b2e..08224edcc 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 
 		// Set Component System Name Selection
 		$this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options;
-		if ($this->componentSystem_nameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions) &&
+			isset($this->componentSystem_nameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
+		{
+			unset($this->componentSystem_nameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->componentSystem_nameOptions[0]) && !ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
-			{
-				unset($this->componentSystem_nameOptions[0]);
-			}
 			// Component System Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 
 		// Set Target Selection
 		$this->targetOptions = $this->getTheTargetSelections();
-		if ($this->targetOptions)
+		// We do some sanitation for Target filter
+		if (ComponentbuilderHelper::checkArray($this->targetOptions) &&
+			isset($this->targetOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->targetOptions[0]->value))
+		{
+			unset($this->targetOptions[0]);
+		}
+		// Only load Target filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->targetOptions))
 		{
-			// We do some sanitation for Target filter
-			if (isset($this->targetOptions[0]) && !ComponentbuilderHelper::checkString($this->targetOptions[0]->value))
-			{
-				unset($this->targetOptions[0]);
-			}
 			// Target Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL').' -',
@@ -247,13 +253,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 
 		// Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
-		if ($this->typeOptions)
+		// We do some sanitation for Type filter
+		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
+			isset($this->typeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+		{
+			unset($this->typeOptions[0]);
+		}
+		// Only load Type filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->typeOptions))
 		{
-			// We do some sanitation for Type filter
-			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
-			{
-				unset($this->typeOptions[0]);
-			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL').' -',
@@ -274,13 +283,16 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 
 		// Set Comment Type Selection
 		$this->comment_typeOptions = $this->getTheComment_typeSelections();
-		if ($this->comment_typeOptions)
+		// We do some sanitation for Comment Type filter
+		if (ComponentbuilderHelper::checkArray($this->comment_typeOptions) &&
+			isset($this->comment_typeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value))
+		{
+			unset($this->comment_typeOptions[0]);
+		}
+		// Only load Comment Type filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->comment_typeOptions))
 		{
-			// We do some sanitation for Comment Type filter
-			if (isset($this->comment_typeOptions[0]) && !ComponentbuilderHelper::checkString($this->comment_typeOptions[0]->value))
-			{
-				unset($this->comment_typeOptions[0]);
-			}
 			// Comment Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL').' -',
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index 1ab2ae334..6c1161c57 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 
 		// Set Main Source Selection
 		$this->main_sourceOptions = $this->getTheMain_sourceSelections();
-		if ($this->main_sourceOptions)
+		// We do some sanitation for Main Source filter
+		if (ComponentbuilderHelper::checkArray($this->main_sourceOptions) &&
+			isset($this->main_sourceOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->main_sourceOptions[0]->value))
+		{
+			unset($this->main_sourceOptions[0]);
+		}
+		// Only load Main Source filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->main_sourceOptions))
 		{
-			// We do some sanitation for Main Source filter
-			if (isset($this->main_sourceOptions[0]) && !ComponentbuilderHelper::checkString($this->main_sourceOptions[0]->value))
-			{
-				unset($this->main_sourceOptions[0]);
-			}
 			// Main Source Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 
 		// Set Gettype Selection
 		$this->gettypeOptions = $this->getTheGettypeSelections();
-		if ($this->gettypeOptions)
+		// We do some sanitation for Gettype filter
+		if (ComponentbuilderHelper::checkArray($this->gettypeOptions) &&
+			isset($this->gettypeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->gettypeOptions[0]->value))
+		{
+			unset($this->gettypeOptions[0]);
+		}
+		// Only load Gettype filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->gettypeOptions))
 		{
-			// We do some sanitation for Gettype filter
-			if (isset($this->gettypeOptions[0]) && !ComponentbuilderHelper::checkString($this->gettypeOptions[0]->value))
-			{
-				unset($this->gettypeOptions[0]);
-			}
 			// Gettype Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL').' -',
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index 596391e67..95dae2132 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -210,13 +210,16 @@ class ComponentbuilderViewFields extends JViewLegacy
 
 		// Set Fieldtype Name Selection
 		$this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options;
-		if ($this->fieldtypeNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions) &&
+			isset($this->fieldtypeNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value))
+		{
+			unset($this->fieldtypeNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->fieldtypeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value))
-			{
-				unset($this->fieldtypeNameOptions[0]);
-			}
 			// Fieldtype Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL').' -',
@@ -237,13 +240,16 @@ class ComponentbuilderViewFields extends JViewLegacy
 
 		// Set Datatype Selection
 		$this->datatypeOptions = $this->getTheDatatypeSelections();
-		if ($this->datatypeOptions)
+		// We do some sanitation for Datatype filter
+		if (ComponentbuilderHelper::checkArray($this->datatypeOptions) &&
+			isset($this->datatypeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value))
+		{
+			unset($this->datatypeOptions[0]);
+		}
+		// Only load Datatype filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->datatypeOptions))
 		{
-			// We do some sanitation for Datatype filter
-			if (isset($this->datatypeOptions[0]) && !ComponentbuilderHelper::checkString($this->datatypeOptions[0]->value))
-			{
-				unset($this->datatypeOptions[0]);
-			}
 			// Datatype Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL').' -',
@@ -264,13 +270,16 @@ class ComponentbuilderViewFields extends JViewLegacy
 
 		// Set Indexes Selection
 		$this->indexesOptions = $this->getTheIndexesSelections();
-		if ($this->indexesOptions)
+		// We do some sanitation for Indexes filter
+		if (ComponentbuilderHelper::checkArray($this->indexesOptions) &&
+			isset($this->indexesOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->indexesOptions[0]->value))
+		{
+			unset($this->indexesOptions[0]);
+		}
+		// Only load Indexes filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->indexesOptions))
 		{
-			// We do some sanitation for Indexes filter
-			if (isset($this->indexesOptions[0]) && !ComponentbuilderHelper::checkString($this->indexesOptions[0]->value))
-			{
-				unset($this->indexesOptions[0]);
-			}
 			// Indexes Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL').' -',
@@ -291,13 +300,16 @@ class ComponentbuilderViewFields extends JViewLegacy
 
 		// Set Null Switch Selection
 		$this->null_switchOptions = $this->getTheNull_switchSelections();
-		if ($this->null_switchOptions)
+		// We do some sanitation for Null Switch filter
+		if (ComponentbuilderHelper::checkArray($this->null_switchOptions) &&
+			isset($this->null_switchOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value))
+		{
+			unset($this->null_switchOptions[0]);
+		}
+		// Only load Null Switch filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->null_switchOptions))
 		{
-			// We do some sanitation for Null Switch filter
-			if (isset($this->null_switchOptions[0]) && !ComponentbuilderHelper::checkString($this->null_switchOptions[0]->value))
-			{
-				unset($this->null_switchOptions[0]);
-			}
 			// Null Switch Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL').' -',
@@ -318,13 +330,16 @@ class ComponentbuilderViewFields extends JViewLegacy
 
 		// Set Store Selection
 		$this->storeOptions = $this->getTheStoreSelections();
-		if ($this->storeOptions)
+		// We do some sanitation for Store filter
+		if (ComponentbuilderHelper::checkArray($this->storeOptions) &&
+			isset($this->storeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->storeOptions[0]->value))
+		{
+			unset($this->storeOptions[0]);
+		}
+		// Only load Store filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->storeOptions))
 		{
-			// We do some sanitation for Store filter
-			if (isset($this->storeOptions[0]) && !ComponentbuilderHelper::checkString($this->storeOptions[0]->value))
-			{
-				unset($this->storeOptions[0]);
-			}
 			// Store Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL').' -',
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 5f93a83e5..e6c9ffc39 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -188,13 +188,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 
 		// Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
-		if ($this->typeOptions)
+		// We do some sanitation for Type filter
+		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
+			isset($this->typeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+		{
+			unset($this->typeOptions[0]);
+		}
+		// Only load Type filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->typeOptions))
 		{
-			// We do some sanitation for Type filter
-			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
-			{
-				unset($this->typeOptions[0]);
-			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL').' -',
@@ -215,13 +218,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 
 		// Set Location Selection
 		$this->locationOptions = $this->getTheLocationSelections();
-		if ($this->locationOptions)
+		// We do some sanitation for Location filter
+		if (ComponentbuilderHelper::checkArray($this->locationOptions) &&
+			isset($this->locationOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->locationOptions[0]->value))
+		{
+			unset($this->locationOptions[0]);
+		}
+		// Only load Location filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->locationOptions))
 		{
-			// We do some sanitation for Location filter
-			if (isset($this->locationOptions[0]) && !ComponentbuilderHelper::checkString($this->locationOptions[0]->value))
-			{
-				unset($this->locationOptions[0]);
-			}
 			// Location Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL').' -',
@@ -242,13 +248,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 
 		// Set Admin View Selection
 		$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
-		if ($this->admin_viewOptions)
+		// We do some sanitation for Location filter
+		if (ComponentbuilderHelper::checkArray($this->admin_viewOptions) &&
+			isset($this->admin_viewOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value))
+		{
+			unset($this->admin_viewOptions[0]);
+		}
+		// Only load Location filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->admin_viewOptions))
 		{
-			// We do some sanitation for Location filter
-			if (isset($this->admin_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value))
-			{
-				unset($this->admin_viewOptions[0]);
-			}
 			// Admin View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -',
@@ -269,13 +278,16 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 
 		// Set Site View Selection
 		$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
-		if ($this->site_viewOptions)
+		// We do some sanitation for Location filter
+		if (ComponentbuilderHelper::checkArray($this->site_viewOptions) &&
+			isset($this->site_viewOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value))
+		{
+			unset($this->site_viewOptions[0]);
+		}
+		// Only load Location filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->site_viewOptions))
 		{
-			// We do some sanitation for Location filter
-			if (isset($this->site_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value))
-			{
-				unset($this->site_viewOptions[0]);
-			}
 			// Site View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL').' -',
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index f417b0619..f2566e150 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -218,13 +218,16 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
 
 		// Set Companyname Selection
 		$this->companynameOptions = $this->getTheCompanynameSelections();
-		if ($this->companynameOptions)
+		// We do some sanitation for Companyname filter
+		if (ComponentbuilderHelper::checkArray($this->companynameOptions) &&
+			isset($this->companynameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->companynameOptions[0]->value))
+		{
+			unset($this->companynameOptions[0]);
+		}
+		// Only load Companyname filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->companynameOptions))
 		{
-			// We do some sanitation for Companyname filter
-			if (isset($this->companynameOptions[0]) && !ComponentbuilderHelper::checkString($this->companynameOptions[0]->value))
-			{
-				unset($this->companynameOptions[0]);
-			}
 			// Companyname Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL').' -',
@@ -245,13 +248,16 @@ class ComponentbuilderViewJoomla_components extends JViewLegacy
 
 		// Set Author Selection
 		$this->authorOptions = $this->getTheAuthorSelections();
-		if ($this->authorOptions)
+		// We do some sanitation for Author filter
+		if (ComponentbuilderHelper::checkArray($this->authorOptions) &&
+			isset($this->authorOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->authorOptions[0]->value))
+		{
+			unset($this->authorOptions[0]);
+		}
+		// Only load Author filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->authorOptions))
 		{
-			// We do some sanitation for Author filter
-			if (isset($this->authorOptions[0]) && !ComponentbuilderHelper::checkString($this->authorOptions[0]->value))
-			{
-				unset($this->authorOptions[0]);
-			}
 			// Author Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL').' -',
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index b15874800..5073b0f94 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewLayouts extends JViewLegacy
 
 		// Set Dynamic Get Name Selection
 		$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
-		if ($this->dynamic_getNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
+			isset($this->dynamic_getNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
+		{
+			unset($this->dynamic_getNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->dynamic_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
-			{
-				unset($this->dynamic_getNameOptions[0]);
-			}
 			// Dynamic Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewLayouts extends JViewLegacy
 
 		// Set Add Php View Selection
 		$this->add_php_viewOptions = $this->getTheAdd_php_viewSelections();
-		if ($this->add_php_viewOptions)
+		// We do some sanitation for Add Php View filter
+		if (ComponentbuilderHelper::checkArray($this->add_php_viewOptions) &&
+			isset($this->add_php_viewOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
+		{
+			unset($this->add_php_viewOptions[0]);
+		}
+		// Only load Add Php View filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_php_viewOptions))
 		{
-			// We do some sanitation for Add Php View filter
-			if (isset($this->add_php_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
-			{
-				unset($this->add_php_viewOptions[0]);
-			}
 			// Add Php View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW_LABEL').' -',
diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php
index 9a4d5fd39..750b54488 100644
--- a/admin/views/libraries/view.html.php
+++ b/admin/views/libraries/view.html.php
@@ -183,13 +183,16 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 
 		// Set How Selection
 		$this->howOptions = JFormHelper::loadFieldType('Filebehaviour')->options;
-		if ($this->howOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->howOptions) &&
+			isset($this->howOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->howOptions[0]->value))
+		{
+			unset($this->howOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->howOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->howOptions[0]) && !ComponentbuilderHelper::checkString($this->howOptions[0]->value))
-			{
-				unset($this->howOptions[0]);
-			}
 			// How Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL').' -',
@@ -210,13 +213,16 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 
 		// Set Type Selection
 		$this->typeOptions = $this->getTheTypeSelections();
-		if ($this->typeOptions)
+		// We do some sanitation for Type filter
+		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
+			isset($this->typeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+		{
+			unset($this->typeOptions[0]);
+		}
+		// Only load Type filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->typeOptions))
 		{
-			// We do some sanitation for Type filter
-			if (isset($this->typeOptions[0]) && !ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
-			{
-				unset($this->typeOptions[0]);
-			}
 			// Type Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL').' -',
diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php
index 005fa8a8c..3f9b21d42 100644
--- a/admin/views/servers/view.html.php
+++ b/admin/views/servers/view.html.php
@@ -188,13 +188,16 @@ class ComponentbuilderViewServers extends JViewLegacy
 
 		// Set Name Selection
 		$this->nameOptions = $this->getTheNameSelections();
-		if ($this->nameOptions)
+		// We do some sanitation for Name filter
+		if (ComponentbuilderHelper::checkArray($this->nameOptions) &&
+			isset($this->nameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->nameOptions[0]->value))
+		{
+			unset($this->nameOptions[0]);
+		}
+		// Only load Name filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->nameOptions))
 		{
-			// We do some sanitation for Name filter
-			if (isset($this->nameOptions[0]) && !ComponentbuilderHelper::checkString($this->nameOptions[0]->value))
-			{
-				unset($this->nameOptions[0]);
-			}
 			// Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_NAME_LABEL').' -',
@@ -215,13 +218,16 @@ class ComponentbuilderViewServers extends JViewLegacy
 
 		// Set Protocol Selection
 		$this->protocolOptions = $this->getTheProtocolSelections();
-		if ($this->protocolOptions)
+		// We do some sanitation for Protocol filter
+		if (ComponentbuilderHelper::checkArray($this->protocolOptions) &&
+			isset($this->protocolOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->protocolOptions[0]->value))
+		{
+			unset($this->protocolOptions[0]);
+		}
+		// Only load Protocol filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->protocolOptions))
 		{
-			// We do some sanitation for Protocol filter
-			if (isset($this->protocolOptions[0]) && !ComponentbuilderHelper::checkString($this->protocolOptions[0]->value))
-			{
-				unset($this->protocolOptions[0]);
-			}
 			// Protocol Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL').' -',
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index f71087da6..ed2558801 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 
 		// Set Main Get Name Selection
 		$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
-		if ($this->main_getNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
+			isset($this->main_getNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
+		{
+			unset($this->main_getNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->main_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
-			{
-				unset($this->main_getNameOptions[0]);
-			}
 			// Main Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 
 		// Set Add Php Ajax Selection
 		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
-		if ($this->add_php_ajaxOptions)
+		// We do some sanitation for Add Php Ajax filter
+		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) &&
+			isset($this->add_php_ajaxOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
+		{
+			unset($this->add_php_ajaxOptions[0]);
+		}
+		// Only load Add Php Ajax filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
 		{
-			// We do some sanitation for Add Php Ajax filter
-			if (isset($this->add_php_ajaxOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
-			{
-				unset($this->add_php_ajaxOptions[0]);
-			}
 			// Add Php Ajax Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL').' -',
@@ -247,13 +253,16 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 
 		// Set Add Custom Button Selection
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
-		if ($this->add_custom_buttonOptions)
+		// We do some sanitation for Add Custom Button filter
+		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) &&
+			isset($this->add_custom_buttonOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
+		{
+			unset($this->add_custom_buttonOptions[0]);
+		}
+		// Only load Add Custom Button filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
 		{
-			// We do some sanitation for Add Custom Button filter
-			if (isset($this->add_custom_buttonOptions[0]) && !ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
-			{
-				unset($this->add_custom_buttonOptions[0]);
-			}
 			// Add Custom Button Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index a85326ec8..ac86ec282 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -198,13 +198,16 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 
 		// Set Type Name Selection
 		$this->typeNameOptions = JFormHelper::loadFieldType('Snippettype')->options;
-		if ($this->typeNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->typeNameOptions) &&
+			isset($this->typeNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
+		{
+			unset($this->typeNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->typeNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->typeNameOptions[0]) && !ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
-			{
-				unset($this->typeNameOptions[0]);
-			}
 			// Type Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL').' -',
@@ -225,13 +228,16 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 
 		// Set Library Name Selection
 		$this->libraryNameOptions = JFormHelper::loadFieldType('Library')->options;
-		if ($this->libraryNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->libraryNameOptions) &&
+			isset($this->libraryNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
+		{
+			unset($this->libraryNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->libraryNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->libraryNameOptions[0]) && !ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
-			{
-				unset($this->libraryNameOptions[0]);
-			}
 			// Library Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL').' -',
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index 09651d2d3..482e94779 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -193,13 +193,16 @@ class ComponentbuilderViewTemplates extends JViewLegacy
 
 		// Set Dynamic Get Name Selection
 		$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
-		if ($this->dynamic_getNameOptions)
+		// We do some sanitation for  filter
+		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
+			isset($this->dynamic_getNameOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
+		{
+			unset($this->dynamic_getNameOptions[0]);
+		}
+		// Only load  filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
 		{
-			// We do some sanitation for  filter
-			if (isset($this->dynamic_getNameOptions[0]) && !ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
-			{
-				unset($this->dynamic_getNameOptions[0]);
-			}
 			// Dynamic Get Name Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_LABEL').' -',
@@ -220,13 +223,16 @@ class ComponentbuilderViewTemplates extends JViewLegacy
 
 		// Set Add Php View Selection
 		$this->add_php_viewOptions = $this->getTheAdd_php_viewSelections();
-		if ($this->add_php_viewOptions)
+		// We do some sanitation for Add Php View filter
+		if (ComponentbuilderHelper::checkArray($this->add_php_viewOptions) &&
+			isset($this->add_php_viewOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
+		{
+			unset($this->add_php_viewOptions[0]);
+		}
+		// Only load Add Php View filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->add_php_viewOptions))
 		{
-			// We do some sanitation for Add Php View filter
-			if (isset($this->add_php_viewOptions[0]) && !ComponentbuilderHelper::checkString($this->add_php_viewOptions[0]->value))
-			{
-				unset($this->add_php_viewOptions[0]);
-			}
 			// Add Php View Filter
 			JHtmlSidebar::addFilter(
 				'- Select '.JText::_('COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL').' -',
-- 
2.40.1


From 37d3f1425ea79a5ac5565c43f457a8cf26b1da3e Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 7 Jun 2019 16:59:27 +0200
Subject: [PATCH 10/26] fixed gh-419 to correctly load the category filter
 (extention and view name)

---
 README.md                                   |  2 +-
 admin/README.txt                            |  2 +-
 admin/helpers/compiler/a_Get.php            |  8 +++++---
 admin/helpers/compiler/e_Interpretation.php | 20 ++++++--------------
 admin/helpers/compiler/f_Infusion.php       |  2 +-
 admin/views/fields/view.html.php            |  4 ++--
 admin/views/fieldtypes/view.html.php        |  4 ++--
 componentbuilder.xml                        |  2 +-
 8 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 31233e8df..47dc1de05 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th June, 2019
++ *Last Build*: 7th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 31233e8df..47dc1de05 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th June, 2019
++ *Last Build*: 7th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index dc9b2c255..3d5c81d8b 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -2900,11 +2900,13 @@ class Get
 						if (ComponentbuilderHelper::checkString($listViewName))
 						{
 							// check if we should use another Text Name as this views name
-							$otherName = ComponentbuilderHelper::getBetween($field['settings']->xml, 'othername="', '"');
-							$otherViews = ComponentbuilderHelper::getBetween($field['settings']->xml, 'views="', '"');
-							$otherView = ComponentbuilderHelper::getBetween($field['settings']->xml, 'view="', '"');
+							$otherName = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'othername="', '"'), $this->placeholders);
+							$otherViews = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'views="', '"'), $this->placeholders);
+							$otherView = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'view="', '"'), $this->placeholders);
+							// This is to link other view category
 							if (ComponentbuilderHelper::checkString($otherName) && ComponentbuilderHelper::checkString($otherViews) && ComponentbuilderHelper::checkString($otherView))
 							{
+								// set other category details
 								$this->catOtherName[$listViewName] = array(
 									'name' => ComponentbuilderHelper::safeString($otherName),
 									'views' => ComponentbuilderHelper::safeString($otherViews),
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index f80750831..4c7798ac5 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10947,21 +10947,13 @@ class Interpretation extends Fields
 		return '';
 	}
 
-	public function setCategoryFilter($viewName_single, $viewName_list)
+	public function setCategoryFilter($viewName_list)
 	{
-		if (isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list]))
+		if (isset($this->categoryBuilder[$viewName_list])
+			&& ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])
+			&& isset($this->categoryBuilder[$viewName_list]['extension']))
 		{
-			// check if category has another name
-			if (isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list]))
-			{
-				$targetView = "." . $this->catOtherName[$viewName_list]['view'];
-			}
-			else
-			{
-				$targetView = "." . $viewName_single;
-			}
 			// set component name
-			$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
 			$COPMONENT = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
 			// set filter
 			$filter = array();
@@ -10969,7 +10961,7 @@ class Interpretation extends Fields
 			$filter[] = $this->_t(2) . "JHtmlSidebar::addFilter(";
 			$filter[] = $this->_t(3) . "JText:" . ":_('JOPTION_SELECT_CATEGORY'),";
 			$filter[] = $this->_t(3) . "'filter_category_id',";
-			$filter[] = $this->_t(3) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . $targetView . "'), 'value', 'text', \$this->state->get('filter.category_id'))";
+			$filter[] = $this->_t(3) . "JHtml::_('select.options', JHtml::_('category.options', '" . $this->categoryBuilder[$viewName_list]['extension'] . "'), 'value', 'text', \$this->state->get('filter.category_id'))";
 			$filter[] = $this->_t(2) . ");";
 
 
@@ -10979,7 +10971,7 @@ class Interpretation extends Fields
 			$filter[] = $this->_t(3) . "JHtmlBatch_::addListSelection(";
 			$filter[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT . "_KEEP_ORIGINAL_CATEGORY'),";
 			$filter[] = $this->_t(4) . "'batch[category]',";
-			$filter[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', 'com_" . $component . $targetView . "'), 'value', 'text')";
+			$filter[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', '" . $this->categoryBuilder[$viewName_list]['extension'] . "'), 'value', 'text')";
 			$filter[] = $this->_t(3) . ");";
 			$filter[] = $this->_t(2) . "}";
 
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 38abc6df4..af5d955c4 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -438,7 +438,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_list][$this->hhh . 'SORTFIELDS' . $this->hhh] = $this->setSortFields($viewName_list);
 
 					// CATEGORYFILTER <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_list][$this->hhh . 'CATEGORYFILTER' . $this->hhh] = $this->setCategoryFilter($viewName_single, $viewName_list);
+					$this->fileContentDynamic[$viewName_list][$this->hhh . 'CATEGORYFILTER' . $this->hhh] = $this->setCategoryFilter($viewName_list);
 
 					// CATEGORY_VIEWS
 					if (!isset($this->fileContentStatic[$this->hhh . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]))
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index 95dae2132..a6aa8de80 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -195,7 +195,7 @@ class ComponentbuilderViewFields extends JViewLegacy
 		JHtmlSidebar::addFilter(
 			JText::_('JOPTION_SELECT_CATEGORY'),
 			'filter_category_id',
-			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.field'), 'value', 'text', $this->state->get('filter.category_id'))
+			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fields'), 'value', 'text', $this->state->get('filter.category_id'))
 		);
 
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
@@ -204,7 +204,7 @@ class ComponentbuilderViewFields extends JViewLegacy
 			JHtmlBatch_::addListSelection(
 				JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY'),
 				'batch[category]',
-				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.field'), 'value', 'text')
+				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fields'), 'value', 'text')
 			);
 		}
 
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index defc9c4e6..683e0e33f 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -190,7 +190,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
 		JHtmlSidebar::addFilter(
 			JText::_('JOPTION_SELECT_CATEGORY'),
 			'filter_category_id',
-			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtype'), 'value', 'text', $this->state->get('filter.category_id'))
+			JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtypes'), 'value', 'text', $this->state->get('filter.category_id'))
 		);
 
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
@@ -199,7 +199,7 @@ class ComponentbuilderViewFieldtypes extends JViewLegacy
 			JHtmlBatch_::addListSelection(
 				JText::_('COM_COMPONENTBUILDER_KEEP_ORIGINAL_CATEGORY'),
 				'batch[category]',
-				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtype'), 'value', 'text')
+				JHtml::_('select.options', JHtml::_('category.options', 'com_componentbuilder.fieldtypes'), 'value', 'text')
 			);
 		}
 	}
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 49d873d22..fdc2500c6 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>5th June, 2019</creationDate>
+	<creationDate>7th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From c966720f798d0370312f023ba93246cc2c0ed44b Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sun, 9 Jun 2019 23:19:34 +0200
Subject: [PATCH 11/26] Few more corrections to the category filter, and field
 integration

---
 README.md                                   |  2 +-
 admin/README.txt                            |  2 +-
 admin/helpers/compiler/b_Structure.php      |  2 +-
 admin/helpers/compiler/c_Fields.php         |  5 ++
 admin/helpers/compiler/e_Interpretation.php | 58 +++++++++++++--------
 componentbuilder.xml                        |  2 +-
 site/helpers/category.php                   |  4 +-
 7 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 47dc1de05..e0bc07564 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 7th June, 2019
++ *Last Build*: 9th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 47dc1de05..e0bc07564 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 7th June, 2019
++ *Last Build*: 9th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index 81cd2f8cf..e883bc40f 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -774,7 +774,7 @@ class Structure extends Get
 	{
 		if (ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->static))
 		{
-			$codeName = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$codeName = $this->componentCodeName;
 			// TODO needs more looking at this must be dynamic actualy
 			$this->notNew[] = 'PHPExcel.php';
 			$this->notNew[] = 'LICENSE.txt';
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index e2bad3de6..01fd00e91 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -2702,6 +2702,11 @@ class Fields extends Structure
 			}
 			// get the xml extension name
 			$_extension = $this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'extension="', '"'), $this->placeholders);
+			// if they left out the extention for some reason
+			if (!ComponentbuilderHelper::checkString($_extension))
+			{
+				$_extension = 'com_' . $this->componentCodeName . '.' . $otherView;
+			}
 			// load the category builder
 			$this->categoryBuilder[$view_name_list] = array('code' => $name, 'name' => $listLangName, 'extension' => $_extension);
 			// also set code name for title alias fix
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 4c7798ac5..b103231ff 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -7501,11 +7501,11 @@ class Interpretation extends Fields
 			$header = '';
 			$mainwidth = 12;
 			$sidewidth = 0;
+			// sort the tabs based on key order
 			ksort($this->tabCounter[$viewName_single]);
+			// start tab builinging loop
 			foreach ($this->tabCounter[$viewName_single] as $tabNr => $tabName)
 			{
-				// check if we must load a custom tab
-				
 				$tabWidth = 12;
 				$lrCounter = 0;
 				// set tab lang
@@ -7530,6 +7530,7 @@ class Interpretation extends Fields
 						$buildLayout = false;
 					}
 				}
+				// build layout since just fields
 				if ($buildLayout)
 				{
 					// sort to make sure it loads left first
@@ -7542,7 +7543,9 @@ class Interpretation extends Fields
 						// reset each time
 						$items = '';
 						$itemCounter = 0;
+						// sort the names based on order of keys
 						ksort($names);
+						// build the items array for this alignment
 						foreach ($names as $nr => $name)
 						{
 							if ($itemCounter == 0)
@@ -7555,6 +7558,7 @@ class Interpretation extends Fields
 							}
 							$itemCounter++;
 						}
+						// based on alignment build the layout
 						switch ($alignment)
 						{
 							case 1: // left
@@ -10651,7 +10655,7 @@ class Interpretation extends Fields
 		{
 			$function = array();
 			// set component name
-			$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$component = $this->componentCodeName;
 			foreach ($this->filterBuilder[$viewName_list] as $filter)
 			{
 				if ($filter['type'] != 'category' && ComponentbuilderHelper::checkArray($filter['custom']) && $filter['custom']['extends'] === 'user')
@@ -10985,8 +10989,18 @@ class Interpretation extends Fields
 	{
 		if (isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list]))
 		{
+			// get the actual extention
+			$_extension = $this->categoryBuilder[$viewName_list]['extension'];
+			$_extension = explode('.', $_extension);
 			// set component name
-			$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			if (ComponentbuilderHelper::checkArray($_extension))
+			{
+				$component = str_replace('com_', '', $_extension[0]);
+			}
+			else
+			{
+				$component = $this->componentCodeName;
+			}
 			// check if category has another name
 			if (isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list]))
 			{
@@ -11012,10 +11026,10 @@ class Interpretation extends Fields
 				// set script to global helper file
 				$includeHelper = array();
 				$includeHelper[] = "\n//" . $this->setLine(__LINE__) . "Insure this view category file is loaded.";
-				$includeHelper[] = "\$classname = '" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . ucfirst($viewName_list) . "Categories';";
+				$includeHelper[] = "\$classname = '" . ucfirst( $component ) . ucfirst($viewName_list) . "Categories';";
 				$includeHelper[] = "if (!class_exists(\$classname))";
 				$includeHelper[] = "{";
-				$includeHelper[] = $this->_t(1) . "\$path = JPATH_SITE . '/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/helpers/category" . $viewName_list . ".php';";
+				$includeHelper[] = $this->_t(1) . "\$path = JPATH_SITE . '/components/com_" . $component . "/helpers/category" . $viewName_list . ".php';";
 				$includeHelper[] = $this->_t(1) . "if (is_file(\$path))";
 				$includeHelper[] = $this->_t(1) . "{";
 				$includeHelper[] = $this->_t(2) . "include_once \$path;";
@@ -11026,11 +11040,11 @@ class Interpretation extends Fields
 			// return category view string
 			if (isset($this->fileContentStatic[$this->hhh . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]) && ComponentbuilderHelper::checkString($this->fileContentStatic[$this->hhh . 'ROUTER_CATEGORY_VIEWS' . $this->hhh]))
 			{
-				return "," . PHP_EOL . $this->_t(3) . '"com_' . $component . '.' . $otherViews . '" => "' . $otherView . '"';
+				return "," . PHP_EOL . $this->_t(3) . '"' . $this->categoryBuilder[$viewName_list]['extension'] . '" => "' . $otherView . '"';
 			}
 			else
 			{
-				return PHP_EOL . $this->_t(3) . '"com_' . $component . '.' . $otherViews . '" => "' . $otherView . '"';
+				return PHP_EOL . $this->_t(3) . '"' . $this->categoryBuilder[$viewName_list]['extension'] . '" => "' . $otherView . '"';
 			}
 		}
 		return '';
@@ -11040,7 +11054,7 @@ class Interpretation extends Fields
 	{
 		$allow = array();
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// prepare custom permission script
 		$customAllow = $this->getCustomScriptBuilder('php_allowadd', $viewName_single, '', null, true);
 		// setup correct core target
@@ -11142,7 +11156,7 @@ class Interpretation extends Fields
 	{
 		$allow = array();
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// prepare custom permission script
 		$customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, '', null, true);
 		// setup correct core target
@@ -11352,7 +11366,7 @@ class Interpretation extends Fields
 	public function setJmodelAdminGetForm($viewName_single, $viewName_list)
 	{
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// allways load these
 		$allow = array();
 		$allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the form.";
@@ -11655,7 +11669,7 @@ class Interpretation extends Fields
 	{
 		$allow = array();
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// prepare custom permission script
 		$customAllow = $this->getCustomScriptBuilder('php_allowedit', $viewName_single, $this->_t(2) . "\$recordId = (int) isset(\$data[\$key]) ? \$data[\$key] : 0;" . PHP_EOL);
 		// setup correct core target
@@ -11693,7 +11707,7 @@ class Interpretation extends Fields
 	{
 		$allow = array();
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// setup correct core target
 		$coreLoad = false;
 		if (isset($this->permissionCore[$viewName_single]))
@@ -11777,7 +11791,7 @@ class Interpretation extends Fields
 	{
 		$allow = array();
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// setup correct core target
 		$coreLoad = false;
 		if (isset($this->permissionCore[$viewName_single]))
@@ -11878,7 +11892,7 @@ class Interpretation extends Fields
 	{
 		$allow = array();
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 		// setup correct core target
 		$coreLoad = false;
 		if (isset($this->permissionCore[$viewName_single]))
@@ -11941,7 +11955,7 @@ class Interpretation extends Fields
 		if ($view != 'component')
 		{
 			// set component name
-			$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$component = $this->componentCodeName;
 			// set label
 			$label = 'Permissions in relation to this ' . $view;
 			// set the access fieldset
@@ -13428,7 +13442,7 @@ class Interpretation extends Fields
 			// main lang prefix
 			$lang = $this->langPrefix . '_SUBMENU';
 			// set the code name
-			$codeName = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$codeName = $this->componentCodeName;
 			// set default dashboard
 			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
 			{
@@ -13672,7 +13686,7 @@ class Interpretation extends Fields
 			// main lang prefix
 			$lang = $this->langPrefix . '_MENU';
 			// set the code name
-			$codeName = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$codeName = $this->componentCodeName;
 			// default prefix is none
 			$prefix = '';
 			// check if local is set
@@ -13844,17 +13858,17 @@ class Interpretation extends Fields
 			// set the custom fields
 			if (isset($this->componentData->config) && ComponentbuilderHelper::checkArray($this->componentData->config))
 			{
-				$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+				$component = $this->componentCodeName;
 				$viewName = 'config';
 				$listViewName = 'configs';
 				// set place holders
 				$placeholders = array();
-				$placeholders[$this->hhh . 'component' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentData->name_code);
+				$placeholders[$this->hhh . 'component' . $this->hhh] = $this->componentCodeName;
 				$placeholders[$this->hhh . 'Component' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'F');
 				$placeholders[$this->hhh . 'COMPONENT' . $this->hhh] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
 				$placeholders[$this->hhh . 'view' . $this->hhh] = $viewName;
 				$placeholders[$this->hhh . 'views' . $this->hhh] = $listViewName;
-				$placeholders[$this->bbb . 'component' . $this->ddd] = $placeholders[$this->hhh . 'component' . $this->hhh];
+				$placeholders[$this->bbb . 'component' . $this->ddd] = $this->componentCodeName;
 				$placeholders[$this->bbb . 'Component' . $this->ddd] = $placeholders[$this->hhh . 'Component' . $this->hhh];
 				$placeholders[$this->bbb . 'COMPONENT' . $this->ddd] = $placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
 				$placeholders[$this->bbb . 'view' . $this->ddd] = $viewName;
@@ -14136,7 +14150,7 @@ class Interpretation extends Fields
 	public function setGlobalConfigFieldsets($lang, $autorName, $autorEmail)
 	{
 		// set component name
-		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		$component = $this->componentCodeName;
 
 		// start building field set for config
 		$this->configFieldSets[] = '<fieldset';
diff --git a/componentbuilder.xml b/componentbuilder.xml
index fdc2500c6..a15554311 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>7th June, 2019</creationDate>
+	<creationDate>9th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/site/helpers/category.php b/site/helpers/category.php
index 84fd0b82d..74e34bb4c 100644
--- a/site/helpers/category.php
+++ b/site/helpers/category.php
@@ -17,7 +17,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 
 //Insure this view category file is loaded.
-$classname = 'componentbuilderFieldsCategories';
+$classname = 'ComponentbuilderFieldsCategories';
 if (!class_exists($classname))
 {
 	$path = JPATH_SITE . '/components/com_componentbuilder/helpers/categoryfields.php';
@@ -27,7 +27,7 @@ if (!class_exists($classname))
 	}
 }
 //Insure this view category file is loaded.
-$classname = 'componentbuilderFieldtypesCategories';
+$classname = 'ComponentbuilderFieldtypesCategories';
 if (!class_exists($classname))
 {
 	$path = JPATH_SITE . '/components/com_componentbuilder/helpers/categoryfieldtypes.php';
-- 
2.40.1


From 6da9cb3d421a7d61b57bf4d528b213f1c5b97d72 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Mon, 10 Jun 2019 01:05:37 +0200
Subject: [PATCH 12/26] Fixed gh-417 edit layout by removing the one to many
 div's from the dynamic build method.

---
 README.md                                     |    2 +-
 admin/README.txt                              |    2 +-
 admin/helpers/compiler/e_Interpretation.php   | 1091 +++++++++--------
 admin/views/admin_custom_tabs/tmpl/edit.php   |    1 -
 admin/views/admin_fields/tmpl/edit.php        |    1 -
 .../admin_fields_conditions/tmpl/edit.php     |    1 -
 .../admin_fields_relations/tmpl/edit.php      |    1 -
 admin/views/admin_view/tmpl/edit.php          |    1 -
 .../views/component_admin_views/tmpl/edit.php |    1 -
 admin/views/component_config/tmpl/edit.php    |    1 -
 .../tmpl/edit.php                             |    1 -
 .../tmpl/edit.php                             |    1 -
 admin/views/component_dashboard/tmpl/edit.php |    1 -
 .../component_files_folders/tmpl/edit.php     |    1 -
 .../component_mysql_tweaks/tmpl/edit.php      |    1 -
 .../component_placeholders/tmpl/edit.php      |    1 -
 .../views/component_site_views/tmpl/edit.php  |    1 -
 admin/views/component_updates/tmpl/edit.php   |    1 -
 admin/views/custom_admin_views/view.html.php  |    4 +-
 admin/views/custom_code/tmpl/edit.php         |    1 -
 admin/views/custom_codes/view.html.php        |    4 +-
 admin/views/dynamic_get/tmpl/edit.php         |    1 -
 admin/views/field/tmpl/edit.php               |    1 -
 admin/views/fields/view.html.php              |    4 +-
 admin/views/fieldtype/tmpl/edit.php           |    1 -
 admin/views/help_document/tmpl/edit.php       |    1 -
 admin/views/help_documents/view.html.php      |    8 +-
 admin/views/joomla_component/tmpl/edit.php    |    1 -
 admin/views/language/tmpl/edit.php            |    1 -
 .../views/language_translation/tmpl/edit.php  |    1 -
 admin/views/layouts/view.html.php             |    4 +-
 admin/views/libraries/view.html.php           |    4 +-
 admin/views/library/tmpl/edit.php             |    1 -
 admin/views/library_config/tmpl/edit.php      |    1 -
 .../library_files_folders_urls/tmpl/edit.php  |    1 -
 admin/views/placeholder/tmpl/edit.php         |    1 -
 admin/views/server/tmpl/edit.php              |    1 -
 admin/views/site_views/view.html.php          |    4 +-
 admin/views/snippet/tmpl/edit.php             |    1 -
 admin/views/snippet_type/tmpl/edit.php        |    1 -
 admin/views/snippets/view.html.php            |    8 +-
 admin/views/templates/view.html.php           |    4 +-
 admin/views/validation_rule/tmpl/edit.php     |    1 -
 43 files changed, 622 insertions(+), 548 deletions(-)

diff --git a/README.md b/README.md
index e0bc07564..e04a07bd7 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206669**
++ *Line count*: **206638**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index e0bc07564..e04a07bd7 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206669**
++ *Line count*: **206638**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index b103231ff..70bf10151 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -201,6 +201,13 @@ class Interpretation extends Fields
 	protected $hasIdRequest = array();
 	protected $libwarning = array();
 
+	/**
+	 * alignment names
+	 * 
+	 * @var    array
+	 */
+	protected $alignmentOptions = array(1 => 'left', 2 => 'right', 3 => 'fullwidth', 4 => 'above', 5 => 'under', 6 => 'leftside', 7 => 'rightside');
+
 	/**
 	 * Constructor
 	 */
@@ -7445,219 +7452,39 @@ class Interpretation extends Fields
 		return '';
 	}
 
+	/**
+	 * set Edit Body
+	 *
+	 * @param   array    $view  The view data
+	 *
+	 * @return  string   The edit body
+	 *
+	 */
 	public function setEditBody(&$view)
 	{
 		// set view name
-		$viewName_single = ComponentbuilderHelper::safeString($view['settings']->name_single);
-		// alignment
-		$alignmentNames = array(1 => 'left', 2 => 'right', 3 => 'fullwidth', 4 => 'above', 5 => 'under', 6 => 'leftside', 7 => 'rightside');
+		$view_name_single = ComponentbuilderHelper::safeString($view['settings']->name_single);
 		// main lang prefix
-		$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($viewName_single, 'U');
-
-		if (isset($this->layoutBuilder[$viewName_single]) && ComponentbuilderHelper::checkArray($this->layoutBuilder[$viewName_single]))
+		$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view_name_single, 'U');
+		// check if the load build is set for this view
+		if (isset($this->layoutBuilder[$view_name_single]) && ComponentbuilderHelper::checkArray($this->layoutBuilder[$view_name_single]))
 		{
-			// set the linked view tabs
-			$linkedTab = array();
+			// reset the linked keys
 			$keys = array();
-			// setup correct core target
-			$coreLoad = false;
-			if (isset($this->permissionCore[$viewName_single]))
-			{
-				$core = $this->permissionCore[$viewName_single];
-				$coreLoad = true;
-			}
-			if (isset($this->linkedAdminViews[$viewName_single]) && ComponentbuilderHelper::checkArray($this->linkedAdminViews[$viewName_single]))
-			{
-				foreach ($this->linkedAdminViews[$viewName_single] as $linkedView)
-				{
-					$tabName = $view['settings']->tabs[(int) $linkedView['tab']];
-					$this->tabCounter[$viewName_single][$linkedView['tab']] = $tabName;
-					$linkedTab[$linkedView['adminview']] = $linkedView['tab'];
-					if (ComponentbuilderHelper::checkString($linkedView['key']) && ComponentbuilderHelper::checkString($linkedView['parentkey']))
-					{
-						$keys[$linkedView['adminview']] = array('key' => $linkedView['key'], 'parentKey' => $linkedView['parentkey']);
-					}
-					else
-					{
-						$keys[$linkedView['adminview']] = array('key' => null, 'parentKey' => null);
-					}
-					if (isset($linkedView['addnew']))
-					{
-						$keys[$linkedView['adminview']]['addNewButton'] = (int) $linkedView['addnew'];
-					}
-					else
-					{
-						$keys[$linkedView['adminview']]['addNewButton'] = 0;
-					}
-				}
-			}
+			$linkedViewIdentifier = array();
+			// set the linked view tabs
+			$linkedTab = $this->getEditBodyLinkedAdminViewsTabs($view, $view_name_single, $keys, $linkedViewIdentifier);
 			// custom tab searching array
 			$searchTabs = array();
-			// start tab set
-			$bucket = array();
+			// reset tab values
 			$leftside = '';
 			$rightside = '';
 			$footer = '';
 			$header = '';
 			$mainwidth = 12;
 			$sidewidth = 0;
-			// sort the tabs based on key order
-			ksort($this->tabCounter[$viewName_single]);
-			// start tab builinging loop
-			foreach ($this->tabCounter[$viewName_single] as $tabNr => $tabName)
-			{
-				$tabWidth = 12;
-				$lrCounter = 0;
-				// set tab lang
-				$tabLangName = $langView . '_' . ComponentbuilderHelper::safeString($tabName, 'U');
-				// set tab code name
-				$tabCodeName = ComponentbuilderHelper::safeString($tabName);
-				/// set the values to use in search latter
-				$searchTabs[$tabCodeName] = $tabNr;
-				// add to lang array
-				if (!isset($this->langContent[$this->lang][$tabLangName]))
-				{
-					$this->langContent[$this->lang][$tabLangName] = $tabName;
-				}
-				// check if linked view belongs to this tab
-				$buildLayout = true;
-				$linkedViewId = '';
-				if (ComponentbuilderHelper::checkArray($linkedTab))
-				{
-					if (($linkedViewId = array_search($tabNr, $linkedTab)) !== false)
-					{
-						// don't build
-						$buildLayout = false;
-					}
-				}
-				// build layout since just fields
-				if ($buildLayout)
-				{
-					// sort to make sure it loads left first
-					$alignments = $this->layoutBuilder[$viewName_single][$tabName];
-					ksort($alignments);
-					foreach ($alignments as $alignment => $names)
-					{
-						// set layout code name
-						$layoutCodeName = $tabCodeName . '_' . $alignmentNames[$alignment];
-						// reset each time
-						$items = '';
-						$itemCounter = 0;
-						// sort the names based on order of keys
-						ksort($names);
-						// build the items array for this alignment
-						foreach ($names as $nr => $name)
-						{
-							if ($itemCounter == 0)
-							{
-								$items .= "'" . $name . "'";
-							}
-							else
-							{
-								$items .= "," . PHP_EOL . $this->_t(1) . "'" . $name . "'";
-							}
-							$itemCounter++;
-						}
-						// based on alignment build the layout
-						switch ($alignment)
-						{
-							case 1: // left
-							case 2: // right
-								// count
-								$lrCounter++;
-								// set as items layout
-								$this->setLayout($viewName_single, $layoutCodeName, $items, 'layoutitems');
-								// set the lang to tab
-								$bucket[$tabCodeName]['lang'] = $tabLangName;
-								// load the body
-								if (!isset($bucket[$tabCodeName][(int) $alignment]))
-								{
-									$bucket[$tabCodeName][(int) $alignment] = '';
-								}
-								$bucket[$tabCodeName][(int) $alignment] .= "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-								break;
-							case 3: // fullwidth
-								// set as items layout
-								$this->setLayout($viewName_single, $layoutCodeName, $items, 'layoutfull');
-								// set the lang to tab
-								$bucket[$tabCodeName]['lang'] = $tabLangName;
-								// load the body
-								if (!isset($bucket[$tabCodeName][(int) $alignment]))
-								{
-									$bucket[$tabCodeName][(int) $alignment] = '';
-								}
-								$bucket[$tabCodeName][(int) $alignment] .= "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-								break;
-							case 4: // above
-								// set as title layout
-								$this->setLayout($viewName_single, $layoutCodeName, $items, 'layouttitle');
-								// load to header
-								$header .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-								break;
-							case 5: // under
-								// set as title layout
-								$this->setLayout($viewName_single, $layoutCodeName, $items, 'layouttitle');
-								// load to footer
-								$footer .= PHP_EOL . PHP_EOL . "<div class=\"clearfix\"></div>" . PHP_EOL . "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-								break;
-							case 6: // left side
-								$tabWidth = $tabWidth - 2;
-								// set as items layout
-								$this->setLayout($viewName_single, $layoutCodeName, $items, 'layoutitems');
-								// load the body
-								$leftside .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-								break;
-							case 7: // right side
-								$tabWidth = $tabWidth - 2;
-								// set as items layout
-								$this->setLayout($viewName_single, $layoutCodeName, $items, 'layoutitems');
-								// load the body
-								$rightside .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-								break;
-						}
-					}
-				}
-				else
-				{
-					// set layout code name
-					$layoutCodeName = $tabCodeName . '_fullwidth';
-					// set identifiers
-					$linkedViewIdentifier[$linkedViewId] = $tabCodeName;
-					//set function name
-					$codeName = ComponentbuilderHelper::safeString($this->uniquekey(3) . $tabCodeName);
-					// set as items layout
-					$this->setLayout($viewName_single, $layoutCodeName, $codeName, 'layoutlinkedview');
-					// set the lang to tab
-					$bucket[$tabCodeName]['lang'] = $tabLangName;
-					// set all the linked view stuff
-					$this->secondRunAdmin['setLinkedView'][] = array(
-						'viewId' => $linkedViewId,
-						'viewName_single' => $viewName_single,
-						'codeName' => $codeName,
-						'layoutCodeName' => $layoutCodeName,
-						'key' => $keys[$linkedViewId]['key'],
-						'parentKey' => $keys[$linkedViewId]['parentKey'],
-						'addNewButon' => $keys[$linkedViewId]['addNewButton']);
-					// load the body
-					if (!isset($bucket[$tabCodeName][3]))
-					{
-						$bucket[$tabCodeName][3] = '';
-					}
-					$bucket[$tabCodeName][3] .= "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $layoutCodeName . "', \$this); ?>";
-				}
-				// width calculator :)
-				if ($tabWidth == 8)
-				{
-					$mainwidth = 8;
-					$sidewidth = 2;
-				}
-				elseif ($tabWidth == 10 && $mainwidth != 8)
-				{
-					$mainwidth = 9;
-					$sidewidth = 3;
-				}
-				$bucket[$tabCodeName]['lr'] = $lrCounter;
-			}
+			// get the tabs with positions
+			$tabBucket = $this->getEditBodyTabs($view_name_single, $langView, $linkedTab, $keys, $linkedViewIdentifier, $searchTabs, $leftside, $rightside, $footer, $header, $mainwidth, $sidewidth);
 			// tab counter
 			$tabCounter = 0;
 			// check if width is still 12
@@ -7672,64 +7499,28 @@ class Interpretation extends Fields
 			{
 				$body .= PHP_EOL . $this->_t(1) . '<div class="' . $span . '">';
 			}
-			// now build the template
-			foreach ($bucket as $tabCodeName => $posions)
+			// now build the dynamic tabs
+			foreach ($tabBucket as $tabCodeName => $positions)
 			{
-				// check main if both left and right is set
-				$lrCounter = $posions['lr'];
 				// get lang string
-				$tabLangName = $posions['lang'];
-				// build main center
+				$tabLangName = $positions['lang'];
+				// build main center position
 				$main = '';
 				$mainbottom = '';
-				foreach ($posions as $posion => $string)
-				{
-					if ($lrCounter == 2)
-					{
-						switch ($posion)
-						{
-							case 1: // left
-							case 2: // right
-								$main .= PHP_EOL . $this->_t(3) . '<div class="span6">';
-								$main .= PHP_EOL . $this->_t(4) . $string;
-								$main .= PHP_EOL . $this->_t(3) . '</div>';
-								break;
-						}
-					}
-					else
-					{
-						switch ($posion)
-						{
-							case 1: // left
-							case 2: // right
-								$main .= PHP_EOL . $this->_t(3) . '<div class="span12">';
-								$main .= PHP_EOL . $this->_t(4) . $string;
-								$main .= PHP_EOL . $this->_t(3) . '</div>';
-								break;
-						}
-					}
-					switch ($posion)
-					{
-						case 3: // fullwidth
-							$mainbottom .= PHP_EOL . $this->_t(3) . '<div class="span12">';
-							$mainbottom .= PHP_EOL . $this->_t(4) . $string;
-							$mainbottom .= PHP_EOL . $this->_t(3) . '</div>';
-							break;
-					}
-				}
-				// set acctive tab
+				$this->setEditBodyTabMainCenterPositionDiv($main, $mainbottom, $positions);
+				// set acctive tab (must be in side foreach loop to get active tab code name)
 				if ($tabCounter == 0)
 				{
-					$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.startTabSet', '" . $viewName_single . "Tab', array('active' => '" . $tabCodeName . "')); ?>";
+					$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.startTabSet', '" . $view_name_single . "Tab', array('active' => '" . $tabCodeName . "')); ?>";
 				}
 				// check if custom tab must be added
-				if (($_customTabHTML = $this->addCustomTabs($searchTabs[$tabCodeName], $viewName_single, 1)) !== false)
+				if (($_customTabHTML = $this->addCustomTabs($searchTabs[$tabCodeName], $view_name_single, 1)) !== false)
 				{
 					$body .= $_customTabHTML;
 				}
 				// if this is a linked view set permissions
 				$closeIT = false;
-				if (isset($linkedViewIdentifier) && ComponentbuilderHelper::checkArray($linkedViewIdentifier) && in_array($tabCodeName, $linkedViewIdentifier))
+				if (ComponentbuilderHelper::checkArray($linkedViewIdentifier) && in_array($tabCodeName, $linkedViewIdentifier))
 				{
 					// get view name
 					$linkedViewId = array_search($tabCodeName, $linkedViewIdentifier);
@@ -7759,12 +7550,13 @@ class Interpretation extends Fields
 				{
 					$body .= PHP_EOL;
 				}
-				// start tab
-				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $viewName_single . "Tab', '" . $tabCodeName . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
+				// start addtab body
+				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $view_name_single . "Tab', '" . $tabCodeName . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
 				// add the main
 				$body .= PHP_EOL . $this->_t(2) . '<div class="row-fluid form-horizontal-desktop">';
 				$body .= $main;
 				$body .= PHP_EOL . $this->_t(2) . "</div>";
+				// add main body bottom div if needed
 				if (strlen($mainbottom) > 0)
 				{
 					// add the main bottom
@@ -7772,255 +7564,38 @@ class Interpretation extends Fields
 					$body .= $mainbottom;
 					$body .= PHP_EOL . $this->_t(2) . "</div>";
 				}
+				// end addtab body
 				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.endTab'); ?>";
+				// if we had permissions added
 				if ($closeIT)
 				{
 					$body .= PHP_EOL . $this->_t(1) . "<?php endif; ?>";
 				}
 				// check if custom tab must be added
-				if (($_customTabHTML = $this->addCustomTabs($searchTabs[$tabCodeName], $viewName_single, 2)) !== false)
+				if (($_customTabHTML = $this->addCustomTabs($searchTabs[$tabCodeName], $view_name_single, 2)) !== false)
 				{
 					$body .= $_customTabHTML;
 				}
 				// set counter
 				$tabCounter++;
 			}
-			// add option to load forms loded in via plugins (TODO) we may want to move these tab locations
+			// add option to load forms loaded in via plugins (TODO) we may want to move these tab locations
 			$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php \$this->ignore_fieldsets = array('details','metadata','vdmmetadata','accesscontrol'); ?>";
-			$body .= PHP_EOL . $this->_t(1) . "<?php \$this->tab_name = '" . $viewName_single . "Tab'; ?>";
+			$body .= PHP_EOL . $this->_t(1) . "<?php \$this->tab_name = '" . $view_name_single . "Tab'; ?>";
 			$body .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('joomla.edit.params', \$this); ?>";
-			// set default publishing tab lang
-			$tabLangName = $langView . '_PUBLISHING';
-			// add to lang array
-			if (!isset($this->langContent[$this->lang][$tabLangName]))
-			{
-				$this->langContent[$this->lang][$tabLangName] = 'Publishing';
-			}
-			// the default publishing items
-			$items = array('left' => array(), 'right' => array());
-			// Setup the default (custom) fields
-			// only load (1 => 'left', 2 => 'right')
-			$fieldsAddedRight = false;
-			if (isset($this->newPublishingFields[$viewName_single]))
-			{
-				foreach ($this->newPublishingFields[$viewName_single] as $df_alignment => $df_items)
-				{
-					foreach ($df_items as $df_order => $df_name)
-					{
-						if ($df_alignment == 2 || $df_alignment == 1)
-						{
-							$items[$alignmentNames[$df_alignment]][$df_order] = $df_name;
-						}
-						else
-						{
-							$this->app->enqueueMessage(JText::_('<hr /><h3>Field Warning</h3>'), 'Warning');
-							$this->app->enqueueMessage(JText::sprintf('Your <b>%s</b> field could not be added, since the <b>%s</b> alignment position is not available in the %s (publishing) tab. Please only target <b>Left or right</b> in the publishing tab.', $df_name, $alignmentNames[$df_alignment], $viewName_single), 'Warning');
-						}
-					}
-				}
-				// set switch to trigger notice if custom fields added to right
-				if (ComponentbuilderHelper::checkArray($items['right']))
-				{
-					$fieldsAddedRight = true;
-				}
-			}
-			// load all defaults
-			$loadDefaultFields = array(
-				'left' => array('created', 'created_by', 'modified', 'modified_by'),
-				'right' => array('published', 'ordering', 'access', 'version', 'hits', 'id')
-			);
-			foreach ($loadDefaultFields as $d_alignment => $defaultFields)
-			{
-				foreach ($defaultFields as $defaultField)
-				{
-					if (!isset($this->movedPublishingFields[$viewName_single][$defaultField]))
-					{
-						if ($defaultField != 'access')
-						{
-							$items[$d_alignment][] = $defaultField;
-						}
-						elseif ($defaultField === 'access' && isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
-						{
-							$items[$d_alignment][] = $defaultField;
-						}
-					}
-				}
-			}
-			// check if metadata is added to this view
-			if (isset($this->metadataBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName_single]))
-			{
-				// set default publishing tab code name
-				$tabCodeNameLeft = 'publishing';
-				$tabCodeNameRight = 'metadata';
-				// the default publishing tiems
-				if (ComponentbuilderHelper::checkArray($items['left']) || ComponentbuilderHelper::checkArray($items['right']))
-				{
-					$items_one = '';
-					// load the items into one side
-					if (ComponentbuilderHelper::checkArray($items['left']))
-					{
-						$items_one .= "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['left']) . "'";
-					}
-					if (ComponentbuilderHelper::checkArray($items['right']))
-					{
-						// there is already fields just add these
-						if (strlen($items_one) > 3)
-						{
-							$items_one .= "," . PHP_EOL . $this->_t(1) . "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['right']) . "'";
-						}
-						// no fields has been added yet
-						else
-						{
-							$items_one .= "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['right']) . "'";
-						}
-					}
-					// only triger the info notice if there were custom fields targeted to the right alignment position.
-					if ($fieldsAddedRight)
-					{
-						$this->app->enqueueMessage(JText::_('<hr /><h3>Field Notice</h3>'), 'Notice');
-						$this->app->enqueueMessage(JText::sprintf('Your field/s added to the <b>right</b> alignment position in the %s (publishing) tab was added to the <b>left</b>. Since we have metadata fields on the right. Fields can only be loaded to the right of the publishing tab if there is no metadata fields.', $viewName_single), 'Notice');
-					}
-					// set the publishing layout
-					$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
-					$items_one = true;
-				}
-				else
-				{
-					$items_one = false;
-				}
-				// set the metadata layout
-				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');
-				$items_two = true;
-			}
-			else
-			{
-				// set default publishing tab code name
-				$tabCodeNameLeft = 'publishing';
-				$tabCodeNameRight = 'publlshing';
-				// the default publishing tiems
-				if (ComponentbuilderHelper::checkArray($items['left']) || ComponentbuilderHelper::checkArray($items['right']))
-				{
-					// load left items that remain
-					if (ComponentbuilderHelper::checkArray($items['left']))
-					{
-						// load all items
-						$items_one = "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['left']) . "'";
-						// set the publishing layout
-						$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
-						$items_one = true;
-					}
-					// load right items that remain
-					if (ComponentbuilderHelper::checkArray($items['right']))
-					{
-						// load all items
-						$items_two = "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['right']) . "'";
-						// set the publishing layout
-						$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
-						$items_two = true;
-					}
-				}
-				else
-				{
-					$items_one = false;
-					$items_two = false;
-				}
-			}
-			if ($items_one && $items_two)
-			{
-				$classs = "span6";
-			}
-			elseif ($items_one || $items_two)
-			{
-				$classs = "span12";
-			}
-			// only load this if needed
-			if ($items_one || $items_two)
-			{
-				// check if the item has permissions.
-				$publishingPer = array();
-				$allToBeChekced = array('core.delete', 'core.edit.created_by', 'core.edit.state', 'core.edit.created');
-				foreach ($allToBeChekced as $core_permission)
-				{
-					if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single, $this->permissionBuilder['global'][$core[$core_permission]]))
-					{
-						// set permissions.
-						$publishingPer[] = "\$this->canDo->get('" . $core[$core_permission] . "')";
-					}
-					else
-					{
-						// set permissions.
-						$publishingPer[] = "\$this->canDo->get('" . $core_permission . "')";
-					}
-				}
-				// check if custom tab must be added
-				if (($_customTabHTML = $this->addCustomTabs(15, $viewName_single, 1)) !== false)
-				{
-					$body .= $_customTabHTML;
-				}
-				$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php if (" . implode(' || ', $publishingPer) . ") : ?>";
-				// set the default publishing tab
-				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $viewName_single . "Tab', '" . $tabCodeNameLeft . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
-				$body .= PHP_EOL . $this->_t(2) . '<div class="row-fluid form-horizontal-desktop">';
-				if ($items_one)
-				{
-					$body .= PHP_EOL . $this->_t(3) . '<div class="' . $classs . '">';
-					$body .= PHP_EOL . $this->_t(4) . "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $tabCodeNameLeft . "', \$this); ?>";
-					$body .= PHP_EOL . $this->_t(3) . "</div>";
-				}
-				if ($items_two)
-				{
-					$body .= PHP_EOL . $this->_t(3) . '<div class="' . $classs . '">';
-					$body .= PHP_EOL . $this->_t(4) . "<?php echo JLayoutHelper::render('" . $viewName_single . "." . $tabCodeNameRight . "', \$this); ?>";
-					$body .= PHP_EOL . $this->_t(3) . "</div>";
-				}
-				$body .= PHP_EOL . $this->_t(2) . "</div>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.endTab'); ?>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php endif; ?>";
-				// check if custom tab must be added
-				if (($_customTabHTML = $this->addCustomTabs(15, $viewName_single, 2)) !== false)
-				{
-					$body .= $_customTabHTML;
-				}
-			}
-			// make sure we dont load it to a view with the name component
-			if ($viewName_single != 'component')
-			{
-				// set permissions tab lang
-				$tabLangName = $langView . '_PERMISSION';
-				// set permissions tab code name
-				$tabCodeName = 'permissions';
-				// add to lang array
-				if (!isset($this->langContent[$this->lang][$tabLangName]))
-				{
-					$this->langContent[$this->lang][$tabLangName] = 'Permissions';
-				}
-				// set the permissions tab
-				$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php if (\$this->canDo->get('core.admin')) : ?>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $viewName_single . "Tab', '" . $tabCodeName . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
-				$body .= PHP_EOL . $this->_t(2) . '<div class="row-fluid form-horizontal-desktop">';
-				$body .= PHP_EOL . $this->_t(3) . '<div class="span12">';
-				$body .= PHP_EOL . $this->_t(4) . '<fieldset class="adminform">';
-				$body .= PHP_EOL . $this->_t(5) . '<div class="adminformlist">';
-				$body .= PHP_EOL . $this->_t(5) . "<?php foreach (\$this->form->getFieldset('accesscontrol') as \$field): ?>";
-				$body .= PHP_EOL . $this->_t(6) . "<div>";
-				$body .= PHP_EOL . $this->_t(7) . "<?php echo \$field->label; echo \$field->input;?>";
-				$body .= PHP_EOL . $this->_t(6) . "</div>";
-				$body .= PHP_EOL . $this->_t(6) . '<div class="clearfix"></div>';
-				$body .= PHP_EOL . $this->_t(5) . "<?php endforeach; ?>";
-				$body .= PHP_EOL . $this->_t(5) . "</div>";
-				$body .= PHP_EOL . $this->_t(4) . "</fieldset>";
-				$body .= PHP_EOL . $this->_t(3) . "</div>";
-				$body .= PHP_EOL . $this->_t(2) . "</div>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.endTab'); ?>";
-				$body .= PHP_EOL . $this->_t(1) . "<?php endif; ?>";
-			}
+			// add the publish and meta data tabs
+			$body .= $this->getEditBodyPublishMetaTabs($view_name_single, $langView);
 			// end the tab set
 			$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.endTabSet'); ?>";
 			$body .= PHP_EOL . PHP_EOL . $this->_t(1) . "<div>";
-			$body .= PHP_EOL . $this->_t(2) . '<input type="hidden" name="task" value="' . $viewName_single . '.edit" />';
+			$body .= PHP_EOL . $this->_t(2) . '<input type="hidden" name="task" value="' . $view_name_single . '.edit" />';
 			$body .= PHP_EOL . $this->_t(2) . "<?php echo JHtml::_('form.token'); ?>";
 			$body .= PHP_EOL . $this->_t(1) . "</div>";
-			$body .= PHP_EOL . $this->_t(1) . "</div>";
+			// close divs
+			if (ComponentbuilderHelper::checkString($span))
+			{
+				$body .= PHP_EOL . $this->_t(1) . "</div>";
+			}
 			$body .= PHP_EOL . "</div>";
 			// check if left has been set
 			if (strlen($leftside) > 0)
@@ -8046,6 +7621,536 @@ class Interpretation extends Fields
 		return '';
 	}
 
+	/**
+	 * get Edit Body Linked Admin Views
+	 *
+	 * @param   array    $view                   The view data
+	 * @param   string   $view_name_single       The single view name
+	 * @param   array    $keys                   The tabs to add in layout
+	 * @param   array    $linkedViewIdentifier   The linked view identifier
+	 *
+	 * @return  array   The linked Admin Views tabs
+	 *
+	 */
+	protected function getEditBodyLinkedAdminViewsTabs(&$view, &$view_name_single, &$keys, &$linkedViewIdentifier)
+	{
+		// start linked tabs bucket
+		$linkedTab = array();
+		// check if the view has linked admin view 
+		if (isset($this->linkedAdminViews[$view_name_single]) && ComponentbuilderHelper::checkArray($this->linkedAdminViews[$view_name_single]))
+		{
+			foreach ($this->linkedAdminViews[$view_name_single] as $linkedView)
+			{
+				// get the tab name
+				$tabName = $view['settings']->tabs[(int) $linkedView['tab']];
+				// update the tab counter
+				$this->tabCounter[$view_name_single][$linkedView['tab']] = $tabName;
+				// add the linked view
+				$linkedTab[$linkedView['adminview']] = $linkedView['tab'];
+				// set the keys if values are set
+				if (ComponentbuilderHelper::checkString($linkedView['key']) && ComponentbuilderHelper::checkString($linkedView['parentkey']))
+				{
+					$keys[$linkedView['adminview']] = array('key' => $linkedView['key'], 'parentKey' => $linkedView['parentkey']);
+				}
+				else
+				{
+					$keys[$linkedView['adminview']] = array('key' => null, 'parentKey' => null);
+				}
+				// set the button switches
+				if (isset($linkedView['addnew']))
+				{
+					$keys[$linkedView['adminview']]['addNewButton'] = (int) $linkedView['addnew'];
+				}
+				else
+				{
+					$keys[$linkedView['adminview']]['addNewButton'] = 0;
+				}
+			}
+		}
+		return $linkedTab;
+	}
+
+	/**
+	 * get Edit Body Tabs
+	 *
+	 * @param   string    $view_name_single        The single view name
+	 * @param   string    $langView                The main lang prefix
+	 * @param   array     $linkedTab               The linked admin view tabs
+	 * @param   array     $keys                    The tabs to add in layout
+	 * @param   array     $linkedViewIdentifier    The linked view identifier
+	 * @param   array     $searchTabs              The tabs to add in layout
+	 * @param   string    $leftside                The left side html string
+	 * @param   string    $rightside               The right side html string
+	 * @param   string    $footer                  The footer html string
+	 * @param   string    $header                  The header html string
+	 * @param   int       $mainwidth               The main width value
+	 * @param   int       $sidewidth               The side width value
+	 *
+	 * @return  array   The linked tabs
+	 *
+	 */
+	protected function getEditBodyTabs(&$view_name_single, &$langView, &$linkedTab, &$keys, &$linkedViewIdentifier, &$searchTabs, &$leftside, &$rightside, &$footer, &$header, &$mainwidth, &$sidewidth)
+	{
+		// start tabs 
+		$tabs = array();
+		// sort the tabs based on key order
+		ksort($this->tabCounter[$view_name_single]);
+		// start tab builinging loop
+		foreach ($this->tabCounter[$view_name_single] as $tabNr => $tabName)
+		{
+			$tabWidth = 12;
+			$lrCounter = 0;
+			// set tab lang
+			$tabLangName = $langView . '_' . ComponentbuilderHelper::safeString($tabName, 'U');
+			// set tab code name
+			$tabCodeName = ComponentbuilderHelper::safeString($tabName);
+			/// set the values to use in search latter
+			$searchTabs[$tabCodeName] = $tabNr;
+			// add to lang array
+			if (!isset($this->langContent[$this->lang][$tabLangName]))
+			{
+				$this->langContent[$this->lang][$tabLangName] = $tabName;
+			}
+			// check if linked view belongs to this tab
+			$buildLayout = true;
+			$linkedViewId = '';
+			if (ComponentbuilderHelper::checkArray($linkedTab))
+			{
+				if (($linkedViewId = array_search($tabNr, $linkedTab)) !== false)
+				{
+					// don't build (since this is a linked view)
+					$buildLayout = false;
+				}
+			}
+			// build layout these are actual fields
+			if ($buildLayout)
+			{
+				// sort to make sure it loads left first
+				$alignments = $this->layoutBuilder[$view_name_single][$tabName];
+				ksort($alignments);
+				foreach ($alignments as $alignment => $names)
+				{
+					// set layout code name
+					$layoutCodeName = $tabCodeName . '_' . $this->alignmentOptions[$alignment];
+					// reset each time
+					$items = '';
+					$itemCounter = 0;
+					// sort the names based on order of keys
+					ksort($names);
+					// build the items array for this alignment
+					foreach ($names as $nr => $name)
+					{
+						if ($itemCounter == 0)
+						{
+							$items .= "'" . $name . "'";
+						}
+						else
+						{
+							$items .= "," . PHP_EOL . $this->_t(1) . "'" . $name . "'";
+						}
+						$itemCounter++;
+					}
+					// based on alignment build the layout
+					switch ($alignment)
+					{
+						case 1: // left
+						case 2: // right
+							// count
+							$lrCounter++;
+							// set as items layout
+							$this->setLayout($view_name_single, $layoutCodeName, $items, 'layoutitems');
+							// set the lang to tab
+							$tabs[$tabCodeName]['lang'] = $tabLangName;
+							// load the body
+							if (!isset($tabs[$tabCodeName][(int) $alignment]))
+							{
+								$tabs[$tabCodeName][(int) $alignment] = '';
+							}
+							$tabs[$tabCodeName][(int) $alignment] .= "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+							break;
+						case 3: // fullwidth
+							// set as items layout
+							$this->setLayout($view_name_single, $layoutCodeName, $items, 'layoutfull');
+							// set the lang to tab
+							$tabs[$tabCodeName]['lang'] = $tabLangName;
+							// load the body
+							if (!isset($tabs[$tabCodeName][(int) $alignment]))
+							{
+								$tabs[$tabCodeName][(int) $alignment] = '';
+							}
+							$tabs[$tabCodeName][(int) $alignment] .= "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+							break;
+						case 4: // above
+							// set as title layout
+							$this->setLayout($view_name_single, $layoutCodeName, $items, 'layouttitle');
+							// load to header
+							$header .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+							break;
+						case 5: // under
+							// set as title layout
+							$this->setLayout($view_name_single, $layoutCodeName, $items, 'layouttitle');
+							// load to footer
+							$footer .= PHP_EOL . PHP_EOL . "<div class=\"clearfix\"></div>" . PHP_EOL . "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+							break;
+						case 6: // left side
+							$tabWidth = $tabWidth - 2;
+							// set as items layout
+							$this->setLayout($view_name_single, $layoutCodeName, $items, 'layoutitems');
+							// load the body
+							$leftside .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+							break;
+						case 7: // right side
+							$tabWidth = $tabWidth - 2;
+							// set as items layout
+							$this->setLayout($view_name_single, $layoutCodeName, $items, 'layoutitems');
+							// load the body
+							$rightside .= PHP_EOL . $this->_t(1) . "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+							break;
+					}
+				}
+			}
+			else
+			{
+				// set layout code name
+				$layoutCodeName = $tabCodeName . '_fullwidth';
+				// set identifiers
+				$linkedViewIdentifier[$linkedViewId] = $tabCodeName;
+				//set function name
+				$codeName = ComponentbuilderHelper::safeString($this->uniquekey(3) . $tabCodeName);
+				// set as items layout
+				$this->setLayout($view_name_single, $layoutCodeName, $codeName, 'layoutlinkedview');
+				// set the lang to tab
+				$tabs[$tabCodeName]['lang'] = $tabLangName;
+				// set all the linked view stuff
+				$this->secondRunAdmin['setLinkedView'][] = array(
+					'viewId' => $linkedViewId,
+					'view_name_single' => $view_name_single,
+					'codeName' => $codeName,
+					'layoutCodeName' => $layoutCodeName,
+					'key' => $keys[$linkedViewId]['key'],
+					'parentKey' => $keys[$linkedViewId]['parentKey'],
+					'addNewButon' => $keys[$linkedViewId]['addNewButton']);
+				// load the body
+				if (!isset($tabs[$tabCodeName][3]))
+				{
+					$tabs[$tabCodeName][3] = '';
+				}
+				$tabs[$tabCodeName][3] .= "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $layoutCodeName . "', \$this); ?>";
+			}
+			// width calculator :)
+			if ($tabWidth == 8)
+			{
+				$mainwidth = 8;
+				$sidewidth = 2;
+			}
+			elseif ($tabWidth == 10 && $mainwidth != 8)
+			{
+				$mainwidth = 9;
+				$sidewidth = 3;
+			}
+			$tabs[$tabCodeName]['lr'] = $lrCounter;
+		}
+		return $tabs;
+	}
+
+	/**
+	 * set Edit Body Main Center Positions Div
+	 *
+	 * @param   string    $main         The main position of this tab
+	 * @param   string    $mainbottom   The main bottom position of this tab
+	 * @param   array     $positions    The build positions of this tab
+	 *
+	 * @return  array   The linked Admin Views tabs
+	 *
+	 */
+	protected function setEditBodyTabMainCenterPositionDiv(&$main, &$mainbottom, &$positions)
+	{
+		foreach ($positions as $position => $string)
+		{
+			if ($positions['lr'] == 2)
+			{
+				switch ($position)
+				{
+					case 1: // left
+					case 2: // right
+						$main .= PHP_EOL . $this->_t(3) . '<div class="span6">';
+						$main .= PHP_EOL . $this->_t(4) . $string;
+						$main .= PHP_EOL . $this->_t(3) . '</div>';
+						break;
+				}
+			}
+			else
+			{
+				switch ($position)
+				{
+					case 1: // left
+					case 2: // right
+						$main .= PHP_EOL . $this->_t(3) . '<div class="span12">';
+						$main .= PHP_EOL . $this->_t(4) . $string;
+						$main .= PHP_EOL . $this->_t(3) . '</div>';
+						break;
+				}
+			}
+			switch ($position)
+			{
+				case 3: // fullwidth
+					$mainbottom .= PHP_EOL . $this->_t(3) . '<div class="span12">';
+					$mainbottom .= PHP_EOL . $this->_t(4) . $string;
+					$mainbottom .= PHP_EOL . $this->_t(3) . '</div>';
+					break;
+			}
+		}
+	}
+
+	/**
+	 * get Edit Body Publish and Meta Tab
+	 *
+	 * @param   string    $view_name_single    The single view name
+	 * @param   string    $langView            The main lang prefix
+	 *
+	 * @return  string   The published and Meta Data Tabs
+	 *
+	 */
+	protected function getEditBodyPublishMetaTabs(&$view_name_single, &$langView)
+	{
+		// build the two tabs
+		$tabs = '';
+		// set default publishing tab lang
+		$tabLangName = $langView . '_PUBLISHING';
+		// add to lang array
+		if (!isset($this->langContent[$this->lang][$tabLangName]))
+		{
+			$this->langContent[$this->lang][$tabLangName] = 'Publishing';
+		}
+		// the default publishing items
+		$items = array('left' => array(), 'right' => array());
+		// Setup the default (custom) fields
+		// only load (1 => 'left', 2 => 'right')
+		$fieldsAddedRight = false;
+		if (isset($this->newPublishingFields[$view_name_single]))
+		{
+			foreach ($this->newPublishingFields[$view_name_single] as $df_alignment => $df_items)
+			{
+				foreach ($df_items as $df_order => $df_name)
+				{
+					if ($df_alignment == 2 || $df_alignment == 1)
+					{
+						$items[$this->alignmentOptions[$df_alignment]][$df_order] = $df_name;
+					}
+					else
+					{
+						$this->app->enqueueMessage(JText::_('<hr /><h3>Field Warning</h3>'), 'Warning');
+						$this->app->enqueueMessage(JText::sprintf('Your <b>%s</b> field could not be added, since the <b>%s</b> alignment position is not available in the %s (publishing) tab. Please only target <b>Left or right</b> in the publishing tab.', $df_name, $this->alignmentOptions[$df_alignment], $view_name_single), 'Warning');
+					}
+				}
+			}
+			// set switch to trigger notice if custom fields added to right
+			if (ComponentbuilderHelper::checkArray($items['right']))
+			{
+				$fieldsAddedRight = true;
+			}
+		}
+		// load all defaults
+		$loadDefaultFields = array(
+			'left' => array('created', 'created_by', 'modified', 'modified_by'),
+			'right' => array('published', 'ordering', 'access', 'version', 'hits', 'id')
+		);
+		foreach ($loadDefaultFields as $d_alignment => $defaultFields)
+		{
+			foreach ($defaultFields as $defaultField)
+			{
+				if (!isset($this->movedPublishingFields[$view_name_single][$defaultField]))
+				{
+					if ($defaultField != 'access')
+					{
+						$items[$d_alignment][] = $defaultField;
+					}
+					elseif ($defaultField === 'access' && isset($this->accessBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view_name_single]))
+					{
+						$items[$d_alignment][] = $defaultField;
+					}
+				}
+			}
+		}
+		// check if metadata is added to this view
+		if (isset($this->metadataBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view_name_single]))
+		{
+			// set default publishing tab code name
+			$tabCodeNameLeft = 'publishing';
+			$tabCodeNameRight = 'metadata';
+			// the default publishing tiems
+			if (ComponentbuilderHelper::checkArray($items['left']) || ComponentbuilderHelper::checkArray($items['right']))
+			{
+				$items_one = '';
+				// load the items into one side
+				if (ComponentbuilderHelper::checkArray($items['left']))
+				{
+					$items_one .= "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['left']) . "'";
+				}
+				if (ComponentbuilderHelper::checkArray($items['right']))
+				{
+					// there is already fields just add these
+					if (strlen($items_one) > 3)
+					{
+						$items_one .= "," . PHP_EOL . $this->_t(1) . "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['right']) . "'";
+					}
+					// no fields has been added yet
+					else
+					{
+						$items_one .= "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['right']) . "'";
+					}
+				}
+				// only triger the info notice if there were custom fields targeted to the right alignment position.
+				if ($fieldsAddedRight)
+				{
+					$this->app->enqueueMessage(JText::_('<hr /><h3>Field Notice</h3>'), 'Notice');
+					$this->app->enqueueMessage(JText::sprintf('Your field/s added to the <b>right</b> alignment position in the %s (publishing) tab was added to the <b>left</b>. Since we have metadata fields on the right. Fields can only be loaded to the right of the publishing tab if there is no metadata fields.', $view_name_single), 'Notice');
+				}
+				// set the publishing layout
+				$this->setLayout($view_name_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+				$items_one = true;
+			}
+			else
+			{
+				$items_one = false;
+			}
+			// set the metadata layout
+			$this->setLayout($view_name_single, $tabCodeNameRight, false, 'layoutmetadata');
+			$items_two = true;
+		}
+		else
+		{
+			// set default publishing tab code name
+			$tabCodeNameLeft = 'publishing';
+			$tabCodeNameRight = 'publlshing';
+			// the default publishing tiems
+			if (ComponentbuilderHelper::checkArray($items['left']) || ComponentbuilderHelper::checkArray($items['right']))
+			{
+				// load left items that remain
+				if (ComponentbuilderHelper::checkArray($items['left']))
+				{
+					// load all items
+					$items_one = "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['left']) . "'";
+					// set the publishing layout
+					$this->setLayout($view_name_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+					$items_one = true;
+				}
+				// load right items that remain
+				if (ComponentbuilderHelper::checkArray($items['right']))
+				{
+					// load all items
+					$items_two = "'" . implode("'," . PHP_EOL . $this->_t(1) . "'", $items['right']) . "'";
+					// set the publishing layout
+					$this->setLayout($view_name_single, $tabCodeNameRight, $items_two, 'layoutpublished');
+					$items_two = true;
+				}
+			}
+			else
+			{
+				$items_one = false;
+				$items_two = false;
+			}
+		}
+		if ($items_one && $items_two)
+		{
+			$classs = "span6";
+		}
+		elseif ($items_one || $items_two)
+		{
+			$classs = "span12";
+		}
+		// setup correct core target
+		$coreLoad = false;
+		if (isset($this->permissionCore[$view_name_single]))
+		{
+			$core = $this->permissionCore[$view_name_single];
+			$coreLoad = true;
+		}
+		// only load this if needed
+		if ($items_one || $items_two)
+		{
+			// check if the item has permissions.
+			$publishingPer = array();
+			$allToBeChekced = array('core.delete', 'core.edit.created_by', 'core.edit.state', 'core.edit.created');
+			foreach ($allToBeChekced as $core_permission)
+			{
+				if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($view_name_single, $this->permissionBuilder['global'][$core[$core_permission]]))
+				{
+					// set permissions.
+					$publishingPer[] = "\$this->canDo->get('" . $core[$core_permission] . "')";
+				}
+				else
+				{
+					// set permissions.
+					$publishingPer[] = "\$this->canDo->get('" . $core_permission . "')";
+				}
+			}
+			// check if custom tab must be added
+			if (($_customTabHTML = $this->addCustomTabs(15, $view_name_single, 1)) !== false)
+			{
+				$tabs .= $_customTabHTML;
+			}
+			$tabs .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php if (" . implode(' || ', $publishingPer) . ") : ?>";
+			// set the default publishing tab
+			$tabs .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $view_name_single . "Tab', '" . $tabCodeNameLeft . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
+			$tabs .= PHP_EOL . $this->_t(2) . '<div class="row-fluid form-horizontal-desktop">';
+			if ($items_one)
+			{
+				$tabs .= PHP_EOL . $this->_t(3) . '<div class="' . $classs . '">';
+				$tabs .= PHP_EOL . $this->_t(4) . "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $tabCodeNameLeft . "', \$this); ?>";
+				$tabs .= PHP_EOL . $this->_t(3) . "</div>";
+			}
+			if ($items_two)
+			{
+				$tabs .= PHP_EOL . $this->_t(3) . '<div class="' . $classs . '">';
+				$tabs .= PHP_EOL . $this->_t(4) . "<?php echo JLayoutHelper::render('" . $view_name_single . "." . $tabCodeNameRight . "', \$this); ?>";
+				$tabs .= PHP_EOL . $this->_t(3) . "</div>";
+			}
+			$tabs .= PHP_EOL . $this->_t(2) . "</div>";
+			$tabs .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.endTab'); ?>";
+			$tabs .= PHP_EOL . $this->_t(1) . "<?php endif; ?>";
+			// check if custom tab must be added
+			if (($_customTabHTML = $this->addCustomTabs(15, $view_name_single, 2)) !== false)
+			{
+				$tabs .= $_customTabHTML;
+			}
+		}
+
+		// make sure we dont load it to a view with the name component (as this will cause conflict with Joomla conventions)
+		if ($view_name_single != 'component')
+		{
+			// set permissions tab lang
+			$tabLangName = $langView . '_PERMISSION';
+			// set permissions tab code name
+			$tabCodeName = 'permissions';
+			// add to lang array
+			if (!isset($this->langContent[$this->lang][$tabLangName]))
+			{
+				$this->langContent[$this->lang][$tabLangName] = 'Permissions';
+			}
+			// set the permissions tab
+			$tabs .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php if (\$this->canDo->get('core.admin')) : ?>";
+			$tabs .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $view_name_single . "Tab', '" . $tabCodeName . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
+			$tabs .= PHP_EOL . $this->_t(2) . '<div class="row-fluid form-horizontal-desktop">';
+			$tabs .= PHP_EOL . $this->_t(3) . '<div class="span12">';
+			$tabs .= PHP_EOL . $this->_t(4) . '<fieldset class="adminform">';
+			$tabs .= PHP_EOL . $this->_t(5) . '<div class="adminformlist">';
+			$tabs .= PHP_EOL . $this->_t(5) . "<?php foreach (\$this->form->getFieldset('accesscontrol') as \$field): ?>";
+			$tabs .= PHP_EOL . $this->_t(6) . "<div>";
+			$tabs .= PHP_EOL . $this->_t(7) . "<?php echo \$field->label; echo \$field->input;?>";
+			$tabs .= PHP_EOL . $this->_t(6) . "</div>";
+			$tabs .= PHP_EOL . $this->_t(6) . '<div class="clearfix"></div>';
+			$tabs .= PHP_EOL . $this->_t(5) . "<?php endforeach; ?>";
+			$tabs .= PHP_EOL . $this->_t(5) . "</div>";
+			$tabs .= PHP_EOL . $this->_t(4) . "</fieldset>";
+			$tabs .= PHP_EOL . $this->_t(3) . "</div>";
+			$tabs .= PHP_EOL . $this->_t(2) . "</div>";
+			$tabs .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.endTab'); ?>";
+			$tabs .= PHP_EOL . $this->_t(1) . "<?php endif; ?>";
+		}
+		return $tabs;
+	}
+
 	protected function addCustomTabs($nr, $name_single, $target)
 	{
 		// check if this view is having custom tabs
@@ -8143,7 +8248,7 @@ class Interpretation extends Fields
 	{
 		/**
 		 * @var $viewId
-		 * @var $viewName_single
+		 * @var $view_name_single
 		 * @var $codeName
 		 * @var $layoutCodeName
 		 * @var $key
@@ -8164,16 +8269,16 @@ class Interpretation extends Fields
 		}
 		if (ComponentbuilderHelper::checkString($single) && ComponentbuilderHelper::checkString($list))
 		{
-			$head = $this->setListHeadLinked($single, $list, $addNewButon, $viewName_single);
-			$body = $this->setListBodyLinked($single, $list, $viewName_single);
+			$head = $this->setListHeadLinked($single, $list, $addNewButon, $view_name_single);
+			$body = $this->setListBodyLinked($single, $list, $view_name_single);
 			$functionName = ComponentbuilderHelper::safeString($codeName, 'F');
 			// LAYOUTITEMSTABLE <<<DYNAMIC>>>
-			$this->fileContentDynamic[$viewName_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh] = $head . $body;
+			$this->fileContentDynamic[$view_name_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh] = $head . $body;
 			// LAYOUTITEMSHEADER <<<DYNAMIC>>>
 			$headerscript = '//' . $this->setLine(__LINE__) . ' set the edit URL';
 			$headerscript .= PHP_EOL . '$edit = "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $list . '&task=' . $single . '.edit";';
 			$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' set a return value';
-			$headerscript .= PHP_EOL . '$return = ($id) ? "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $viewName_single . '&layout=edit&id=" . $id : "";';
+			$headerscript .= PHP_EOL . '$return = ($id) ? "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $view_name_single . '&layout=edit&id=" . $id : "";';
 			$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' check for a return value';
 			$headerscript .= PHP_EOL . '$jinput = JFactory::getApplication()->input;';
 			$headerscript .= PHP_EOL . "if (\$_return = \$jinput->get('return', null, 'base64'))";
@@ -8184,11 +8289,11 @@ class Interpretation extends Fields
 			$headerscript .= PHP_EOL . 'if (' . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . 'Helper::checkString($return))';
 			$headerscript .= PHP_EOL . '{';
 			$headerscript .= PHP_EOL . $this->_t(1) . '//' . $this->setLine(__LINE__) . ' set the referral values';
-			$headerscript .= PHP_EOL . $this->_t(1) . '$ref = ($id) ? "&ref=' . $viewName_single . '&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));';
+			$headerscript .= PHP_EOL . $this->_t(1) . '$ref = ($id) ? "&ref=' . $view_name_single . '&refid=" . $id . "&return=" . urlencode(base64_encode($return)) : "&return=" . urlencode(base64_encode($return));';
 			$headerscript .= PHP_EOL . '}';
 			$headerscript .= PHP_EOL . 'else';
 			$headerscript .= PHP_EOL . '{';
-			$headerscript .= PHP_EOL . $this->_t(1) . '$ref = ($id) ? "&ref=' . $viewName_single . '&refid=" . $id : "";';
+			$headerscript .= PHP_EOL . $this->_t(1) . '$ref = ($id) ? "&ref=' . $view_name_single . '&refid=" . $id : "";';
 			$headerscript .= PHP_EOL . '}';
 			if ($addNewButon > 0)
 			{
@@ -8207,11 +8312,11 @@ class Interpretation extends Fields
 				$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' load the action object';
 				$headerscript .= PHP_EOL . '$can = ' . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . 'Helper::getActions(' . "'" . $single . "'" . ');';
 			}
-			$this->fileContentDynamic[$viewName_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSHEADER' . $this->hhh] = $headerscript;
+			$this->fileContentDynamic[$view_name_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSHEADER' . $this->hhh] = $headerscript;
 			// LINKEDVIEWITEMS <<<DYNAMIC>>>
-			$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWITEMS' . $this->hhh] .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get Linked view data" . PHP_EOL . $this->_t(2) . "\$this->" . $codeName . " = \$this->get('" . $functionName . "');";
+			$this->fileContentDynamic[$view_name_single][$this->hhh . 'LINKEDVIEWITEMS' . $this->hhh] .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get Linked view data" . PHP_EOL . $this->_t(2) . "\$this->" . $codeName . " = \$this->get('" . $functionName . "');";
 			// LINKEDVIEWTABLESCRIPTS <<<DYNAMIC>>>
-			$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWTABLESCRIPTS' . $this->hhh] = $this->setFootableScripts();
+			$this->fileContentDynamic[$view_name_single][$this->hhh . 'LINKEDVIEWTABLESCRIPTS' . $this->hhh] = $this->setFootableScripts();
 			if (strpos($parentKey, '-R>') !== false || strpos($parentKey, '-A>') !== false)
 			{
 				list($parent_key) = explode('-', $parentKey);
@@ -8245,22 +8350,22 @@ class Interpretation extends Fields
 				foreach ($parent_keys as $parent_key)
 				{
 					$globalKey[$parent_key] = ComponentbuilderHelper::safeString($_key . $this->uniquekey(4));
-					$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWGLOBAL' . $this->hhh] .= PHP_EOL . $this->_t(2) . "\$this->" . $globalKey[$parent_key] . " = \$item->" . $parent_key . ";";
+					$this->fileContentDynamic[$view_name_single][$this->hhh . 'LINKEDVIEWGLOBAL' . $this->hhh] .= PHP_EOL . $this->_t(2) . "\$this->" . $globalKey[$parent_key] . " = \$item->" . $parent_key . ";";
 				}
 			}
 			else
 			{
 				// set the global key
 				$globalKey = ComponentbuilderHelper::safeString($_key . $this->uniquekey(4));
-				$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWGLOBAL' . $this->hhh] .= PHP_EOL . $this->_t(2) . "\$this->" . $globalKey . " = \$item->" . $parent_key . ";";
+				$this->fileContentDynamic[$view_name_single][$this->hhh . 'LINKEDVIEWGLOBAL' . $this->hhh] .= PHP_EOL . $this->_t(2) . "\$this->" . $globalKey . " = \$item->" . $parent_key . ";";
 			}
 			// LINKEDVIEWMETHODS <<<DYNAMIC>>>
-			$this->fileContentDynamic[$viewName_single][$this->hhh . 'LINKEDVIEWMETHODS' . $this->hhh] .= $this->setListQueryLinked($single, $list, $functionName, $key, $_key, $parentKey, $parent_key, $globalKey);
+			$this->fileContentDynamic[$view_name_single][$this->hhh . 'LINKEDVIEWMETHODS' . $this->hhh] .= $this->setListQueryLinked($single, $list, $functionName, $key, $_key, $parentKey, $parent_key, $globalKey);
 		}
 		else
 		{
-			$this->fileContentDynamic[$viewName_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh] = 'oops! error.....';
-			$this->fileContentDynamic[$viewName_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSHEADER' . $this->hhh] = '';
+			$this->fileContentDynamic[$view_name_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh] = 'oops! error.....';
+			$this->fileContentDynamic[$view_name_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSHEADER' . $this->hhh] = '';
 		}
 	}
 
@@ -10870,14 +10975,14 @@ class Interpretation extends Fields
 					$type = ComponentbuilderHelper::safeString($filter['custom']['type'], 'F');
 					$otherFilter[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection";
 					$otherFilter[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;";
-					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $Codename . " filter";
+					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " We do some sanitation for " . $CodeName . " filter";
 					$otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options) &&";
 					$otherFilter[] = $this->_t(3) . "isset(\$this->" . $codeName . "Options[0]->value) &&";
 					$otherFilter[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))";
 					$otherFilter[] = $this->_t(2) . "{";
 					$otherFilter[] = $this->_t(3) . "unset(\$this->" . $codeName . "Options[0]);";
 					$otherFilter[] = $this->_t(2) . "}";
-					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load " . $Codename . " filter if it has values";
+					$otherFilter[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load " . $CodeName . " filter if it has values";
 					$otherFilter[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options))";
 					$otherFilter[] = $this->_t(2) . "{";
 					$otherFilter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $CodeName . " Filter";
diff --git a/admin/views/admin_custom_tabs/tmpl/edit.php b/admin/views/admin_custom_tabs/tmpl/edit.php
index f60c56f96..1c79ba18f 100644
--- a/admin/views/admin_custom_tabs/tmpl/edit.php
+++ b/admin/views/admin_custom_tabs/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="admin_custom_tabs.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php
index 3b67bf0c1..278221f6f 100644
--- a/admin/views/admin_fields/tmpl/edit.php
+++ b/admin/views/admin_fields/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="admin_fields.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php
index bcf801c43..35293dbf6 100644
--- a/admin/views/admin_fields_conditions/tmpl/edit.php
+++ b/admin/views/admin_fields_conditions/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="admin_fields_conditions.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/admin_fields_relations/tmpl/edit.php b/admin/views/admin_fields_relations/tmpl/edit.php
index 8c3d119f5..732d6d559 100644
--- a/admin/views/admin_fields_relations/tmpl/edit.php
+++ b/admin/views/admin_fields_relations/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="admin_fields_relations.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index 5fcfeeae8..9e7213dcc 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -199,7 +199,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="admin_view.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/component_admin_views/tmpl/edit.php b/admin/views/component_admin_views/tmpl/edit.php
index 2d2638c9b..6cd2c6d48 100644
--- a/admin/views/component_admin_views/tmpl/edit.php
+++ b/admin/views/component_admin_views/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_admin_views.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_config/tmpl/edit.php b/admin/views/component_config/tmpl/edit.php
index 146a68db6..656539340 100644
--- a/admin/views/component_config/tmpl/edit.php
+++ b/admin/views/component_config/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_config.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_custom_admin_menus/tmpl/edit.php b/admin/views/component_custom_admin_menus/tmpl/edit.php
index 94a52643e..a6c005b35 100644
--- a/admin/views/component_custom_admin_menus/tmpl/edit.php
+++ b/admin/views/component_custom_admin_menus/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_custom_admin_menus.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_custom_admin_views/tmpl/edit.php b/admin/views/component_custom_admin_views/tmpl/edit.php
index d07f1067a..b62b5dcee 100644
--- a/admin/views/component_custom_admin_views/tmpl/edit.php
+++ b/admin/views/component_custom_admin_views/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_custom_admin_views.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_dashboard/tmpl/edit.php b/admin/views/component_dashboard/tmpl/edit.php
index fc324dda5..6fbb3b9eb 100644
--- a/admin/views/component_dashboard/tmpl/edit.php
+++ b/admin/views/component_dashboard/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_dashboard.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_files_folders/tmpl/edit.php b/admin/views/component_files_folders/tmpl/edit.php
index 6a9c79eb6..1879c399a 100644
--- a/admin/views/component_files_folders/tmpl/edit.php
+++ b/admin/views/component_files_folders/tmpl/edit.php
@@ -111,7 +111,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_files_folders.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_mysql_tweaks/tmpl/edit.php b/admin/views/component_mysql_tweaks/tmpl/edit.php
index 67ac00d4b..9970e017b 100644
--- a/admin/views/component_mysql_tweaks/tmpl/edit.php
+++ b/admin/views/component_mysql_tweaks/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_mysql_tweaks.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_placeholders/tmpl/edit.php b/admin/views/component_placeholders/tmpl/edit.php
index 0e7bcb08f..351192dcf 100644
--- a/admin/views/component_placeholders/tmpl/edit.php
+++ b/admin/views/component_placeholders/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_placeholders.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_site_views/tmpl/edit.php b/admin/views/component_site_views/tmpl/edit.php
index b1027db93..536689b42 100644
--- a/admin/views/component_site_views/tmpl/edit.php
+++ b/admin/views/component_site_views/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_site_views.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/component_updates/tmpl/edit.php b/admin/views/component_updates/tmpl/edit.php
index e839286b4..4e44499ba 100644
--- a/admin/views/component_updates/tmpl/edit.php
+++ b/admin/views/component_updates/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="component_updates.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 6a846c5d6..4e83cc5dc 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -193,14 +193,14 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 
 		// Set Main Get Name Selection
 		$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Main Get Name filter
 		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
 			isset($this->main_getNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
 		{
 			unset($this->main_getNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Main Get Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
 		{
 			// Main Get Name Filter
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index ef280be15..f8daef458 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -107,7 +107,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="custom_code.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index 08224edcc..db5ad1716 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@@ -193,14 +193,14 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 
 		// Set Component System Name Selection
 		$this->componentSystem_nameOptions = JFormHelper::loadFieldType('Component')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Component System Name filter
 		if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions) &&
 			isset($this->componentSystem_nameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->componentSystem_nameOptions[0]->value))
 		{
 			unset($this->componentSystem_nameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Component System Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->componentSystem_nameOptions))
 		{
 			// Component System Name Filter
diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php
index 24cb27a45..f1fb7a49a 100644
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@@ -150,7 +150,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="dynamic_get.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index 0c0e23432..c8d7469a8 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -138,7 +138,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="field.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index a6aa8de80..e630e565c 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -210,14 +210,14 @@ class ComponentbuilderViewFields extends JViewLegacy
 
 		// Set Fieldtype Name Selection
 		$this->fieldtypeNameOptions = JFormHelper::loadFieldType('Fieldtypes')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Fieldtype Name filter
 		if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions) &&
 			isset($this->fieldtypeNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->fieldtypeNameOptions[0]->value))
 		{
 			unset($this->fieldtypeNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Fieldtype Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->fieldtypeNameOptions))
 		{
 			// Fieldtype Name Filter
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index 70d7950b2..c7b73a222 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -130,7 +130,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="fieldtype.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 69d6aa117..9aa5e5226 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -107,7 +107,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="help_document.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index e6c9ffc39..f8c689ace 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -248,14 +248,14 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 
 		// Set Admin View Selection
 		$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
-		// We do some sanitation for Location filter
+		// We do some sanitation for Admin View filter
 		if (ComponentbuilderHelper::checkArray($this->admin_viewOptions) &&
 			isset($this->admin_viewOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->admin_viewOptions[0]->value))
 		{
 			unset($this->admin_viewOptions[0]);
 		}
-		// Only load Location filter if it has values
+		// Only load Admin View filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->admin_viewOptions))
 		{
 			// Admin View Filter
@@ -278,14 +278,14 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
 
 		// Set Site View Selection
 		$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
-		// We do some sanitation for Location filter
+		// We do some sanitation for Site View filter
 		if (ComponentbuilderHelper::checkArray($this->site_viewOptions) &&
 			isset($this->site_viewOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->site_viewOptions[0]->value))
 		{
 			unset($this->site_viewOptions[0]);
 		}
-		// Only load Location filter if it has values
+		// Only load Site View filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->site_viewOptions))
 		{
 			// Site View Filter
diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php
index 9fb086a8d..e34b2ad7b 100644
--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@@ -216,7 +216,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="joomla_component.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/language/tmpl/edit.php b/admin/views/language/tmpl/edit.php
index 0cf99de05..1f7611150 100644
--- a/admin/views/language/tmpl/edit.php
+++ b/admin/views/language/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="language.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php
index 18e8ac1f4..942618c09 100644
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@@ -100,7 +100,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="language_translation.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index 5073b0f94..1d5d0348e 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -193,14 +193,14 @@ class ComponentbuilderViewLayouts extends JViewLegacy
 
 		// Set Dynamic Get Name Selection
 		$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Dynamic Get Name filter
 		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
 			isset($this->dynamic_getNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
 		{
 			unset($this->dynamic_getNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Dynamic Get Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
 		{
 			// Dynamic Get Name Filter
diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php
index 750b54488..65f000fb1 100644
--- a/admin/views/libraries/view.html.php
+++ b/admin/views/libraries/view.html.php
@@ -183,14 +183,14 @@ class ComponentbuilderViewLibraries extends JViewLegacy
 
 		// Set How Selection
 		$this->howOptions = JFormHelper::loadFieldType('Filebehaviour')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for How filter
 		if (ComponentbuilderHelper::checkArray($this->howOptions) &&
 			isset($this->howOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->howOptions[0]->value))
 		{
 			unset($this->howOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load How filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->howOptions))
 		{
 			// How Filter
diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php
index 18884165b..a3486484a 100644
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@@ -137,7 +137,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="library.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 
 <div class="clearfix"></div>
diff --git a/admin/views/library_config/tmpl/edit.php b/admin/views/library_config/tmpl/edit.php
index 05b4afd7a..fb54628a5 100644
--- a/admin/views/library_config/tmpl/edit.php
+++ b/admin/views/library_config/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="library_config.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/library_files_folders_urls/tmpl/edit.php b/admin/views/library_files_folders_urls/tmpl/edit.php
index 06150a6d3..0945a0a3f 100644
--- a/admin/views/library_files_folders_urls/tmpl/edit.php
+++ b/admin/views/library_files_folders_urls/tmpl/edit.php
@@ -111,7 +111,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="library_files_folders_urls.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/placeholder/tmpl/edit.php b/admin/views/placeholder/tmpl/edit.php
index 7bfa7109d..86a95b352 100644
--- a/admin/views/placeholder/tmpl/edit.php
+++ b/admin/views/placeholder/tmpl/edit.php
@@ -106,7 +106,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="placeholder.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index 649ae69c1..a31794b6f 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -119,7 +119,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="server.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index ed2558801..26fb9cbf2 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -193,14 +193,14 @@ class ComponentbuilderViewSite_views extends JViewLegacy
 
 		// Set Main Get Name Selection
 		$this->main_getNameOptions = JFormHelper::loadFieldType('Maingets')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Main Get Name filter
 		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions) &&
 			isset($this->main_getNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->main_getNameOptions[0]->value))
 		{
 			unset($this->main_getNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Main Get Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->main_getNameOptions))
 		{
 			// Main Get Name Filter
diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php
index 155977b34..712485f5d 100644
--- a/admin/views/snippet/tmpl/edit.php
+++ b/admin/views/snippet/tmpl/edit.php
@@ -96,7 +96,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="snippet.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/snippet_type/tmpl/edit.php b/admin/views/snippet_type/tmpl/edit.php
index 642aaa3e2..3229d5f76 100644
--- a/admin/views/snippet_type/tmpl/edit.php
+++ b/admin/views/snippet_type/tmpl/edit.php
@@ -101,7 +101,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="snippet_type.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index ac86ec282..d5fce4fb1 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -198,14 +198,14 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 
 		// Set Type Name Selection
 		$this->typeNameOptions = JFormHelper::loadFieldType('Snippettype')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Type Name filter
 		if (ComponentbuilderHelper::checkArray($this->typeNameOptions) &&
 			isset($this->typeNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->typeNameOptions[0]->value))
 		{
 			unset($this->typeNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Type Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->typeNameOptions))
 		{
 			// Type Name Filter
@@ -228,14 +228,14 @@ class ComponentbuilderViewSnippets extends JViewLegacy
 
 		// Set Library Name Selection
 		$this->libraryNameOptions = JFormHelper::loadFieldType('Library')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Library Name filter
 		if (ComponentbuilderHelper::checkArray($this->libraryNameOptions) &&
 			isset($this->libraryNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->libraryNameOptions[0]->value))
 		{
 			unset($this->libraryNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Library Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->libraryNameOptions))
 		{
 			// Library Name Filter
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index 482e94779..2875b164c 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -193,14 +193,14 @@ class ComponentbuilderViewTemplates extends JViewLegacy
 
 		// Set Dynamic Get Name Selection
 		$this->dynamic_getNameOptions = JFormHelper::loadFieldType('Dynamicget')->options;
-		// We do some sanitation for  filter
+		// We do some sanitation for Dynamic Get Name filter
 		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions) &&
 			isset($this->dynamic_getNameOptions[0]->value) &&
 			!ComponentbuilderHelper::checkString($this->dynamic_getNameOptions[0]->value))
 		{
 			unset($this->dynamic_getNameOptions[0]);
 		}
-		// Only load  filter if it has values
+		// Only load Dynamic Get Name filter if it has values
 		if (ComponentbuilderHelper::checkArray($this->dynamic_getNameOptions))
 		{
 			// Dynamic Get Name Filter
diff --git a/admin/views/validation_rule/tmpl/edit.php b/admin/views/validation_rule/tmpl/edit.php
index 5a7f2e736..d12d3b46a 100644
--- a/admin/views/validation_rule/tmpl/edit.php
+++ b/admin/views/validation_rule/tmpl/edit.php
@@ -107,7 +107,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 		<input type="hidden" name="task" value="validation_rule.edit" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
-	</div>
 </div>
 </form>
 </div>
-- 
2.40.1


From c8b5993219cfd37df84410f6467287780ddde0bf Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Tue, 11 Jun 2019 14:37:12 +0200
Subject: [PATCH 13/26] Fixed gh-420 to allow the linked site view to save
 correctly.

---
 README.md                                     |  4 +--
 admin/README.txt                              |  4 +--
 admin/models/fields/adminsviews.php           | 33 ++++++++++---------
 admin/models/forms/component_admin_views.xml  | 10 ------
 .../forms/component_custom_admin_menus.xml    |  5 ---
 .../forms/component_custom_admin_views.xml    |  9 -----
 .../models/forms/component_files_folders.xml  |  4 ---
 admin/models/forms/component_site_views.xml   |  5 ---
 .../forms/library_files_folders_urls.xml      |  4 ---
 componentbuilder.xml                          |  2 +-
 10 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index e04a07bd7..de45167cb 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 9th June, 2019
++ *Last Build*: 11th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206638**
++ *Line count*: **206602**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index e04a07bd7..de45167cb 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 9th June, 2019
++ *Last Build*: 11th June, 2019
 + *Version*: 2.9.18
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206638**
++ *Line count*: **206602**
 + *Field count*: **1136**
 + *File count*: **1344**
 + *Folder count*: **209**
diff --git a/admin/models/fields/adminsviews.php b/admin/models/fields/adminsviews.php
index b459a6a64..6c0728229 100644
--- a/admin/models/fields/adminsviews.php
+++ b/admin/models/fields/adminsviews.php
@@ -35,22 +35,23 @@ class JFormFieldAdminsviews extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminviews_system_name')));
-		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.system_name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->adminviews_system_name);
-			}
-		}
+		$db = JFactory::getDBO();
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminviews_system_name')));
+		$query->from($db->quoteName('#__componentbuilder_admin_view', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.system_name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			foreach($items as $item)
+			{
+				$options[] = JHtml::_('select.option', $item->id, $item->adminviews_system_name);
+			}
+		}
+
 		return $options;
 	}
 }
diff --git a/admin/models/forms/component_admin_views.xml b/admin/models/forms/component_admin_views.xml
index 4a59ffc99..7236ff821 100644
--- a/admin/models/forms/component_admin_views.xml
+++ b/admin/models/forms/component_admin_views.xml
@@ -560,7 +560,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -571,7 +570,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_ADD_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -582,7 +580,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -593,7 +590,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -604,7 +600,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CHECKIN_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_CHECKIN_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -615,7 +610,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_HISTORY_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_HISTORY_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -626,7 +620,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_FIELDS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_JOOMLA_FIELDS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -637,7 +630,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -648,7 +640,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -659,7 +650,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_PORT_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/models/forms/component_custom_admin_menus.xml b/admin/models/forms/component_custom_admin_menus.xml
index fe82909b8..066fbc9f4 100644
--- a/admin/models/forms/component_custom_admin_menus.xml
+++ b/admin/models/forms/component_custom_admin_menus.xml
@@ -172,7 +172,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -183,7 +182,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -194,7 +192,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -206,8 +203,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					default=""
-					required="true"
 					button="false"
 				/>
 			</form>
diff --git a/admin/models/forms/component_custom_admin_views.xml b/admin/models/forms/component_custom_admin_views.xml
index adbade988..d4bb68794 100644
--- a/admin/models/forms/component_custom_admin_views.xml
+++ b/admin/models/forms/component_custom_admin_views.xml
@@ -558,7 +558,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_MAINMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_MAINMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -569,7 +568,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_DASHBOARD_LIST_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -580,7 +578,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_SUBMENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_SUBMENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -591,7 +588,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -602,7 +598,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -614,8 +609,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADMINVIEWS_DESCRIPTION"
 					class="fieldMedium"
 					multiple="true"
-					default=""
-					required="true"
 					button="false"
 				/>
 				<!-- Before Field. Type: Componentadminmenus. (custom) -->
@@ -626,8 +619,6 @@
 					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_BEFORE_DESCRIPTION"
 					class="list_class fieldMedium"
 					multiple="false"
-					default=""
-					required="true"
 					button="false"
 				/>
 			</form>
diff --git a/admin/models/forms/component_files_folders.xml b/admin/models/forms/component_files_folders.xml
index b3545f0a4..bafddc473 100644
--- a/admin/models/forms/component_files_folders.xml
+++ b/admin/models/forms/component_files_folders.xml
@@ -149,7 +149,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -205,7 +204,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -259,7 +257,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -312,7 +309,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/models/forms/component_site_views.xml b/admin/models/forms/component_site_views.xml
index fbccadb38..69519b668 100644
--- a/admin/models/forms/component_site_views.xml
+++ b/admin/models/forms/component_site_views.xml
@@ -128,7 +128,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -139,7 +138,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -150,7 +148,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -161,7 +158,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_LABEL"
 					value="1"
 					default="1"
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -172,7 +168,6 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/admin/models/forms/library_files_folders_urls.xml b/admin/models/forms/library_files_folders_urls.xml
index 3334baa9f..d7e733258 100644
--- a/admin/models/forms/library_files_folders_urls.xml
+++ b/admin/models/forms/library_files_folders_urls.xml
@@ -148,7 +148,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -204,7 +203,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
@@ -258,7 +256,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
 					value="1"
 					default=""
-					required="true"
 					class="inputbox"
 				/>
 			</form>
@@ -311,7 +308,6 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
 					value="1"
 					default=""
-					required="true"
 					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
 					class="inputbox"
 				/>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index a15554311..ae52ac6cf 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>9th June, 2019</creationDate>
+	<creationDate>11th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From eae13dff06484354b5733df3c5b27aa6b1b4bbd0 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 12 Jun 2019 22:06:19 +0200
Subject: [PATCH 14/26] Resolved gh-418 by adding an on before cancel custom
 script area to the admin view.

---
 README.md                                     |   12 +-
 admin/README.txt                              |   12 +-
 admin/compiler/joomla_3/JControllerForm.php   |    2 +-
 admin/helpers/compiler/a_Get.php              |    2 +-
 admin/helpers/compiler/f_Infusion.php         |    4 +
 .../en-GB/en-GB.com_componentbuilder.ini      |    9 +-
 admin/layouts/admin_view/php_fullwidth.php    |    2 +
 admin/layouts/fieldtype/fields_fullwidth.php  |    2 +-
 .../server/linked_components_fullwidth.php    |    2 +-
 admin/models/admin_view.php                   |  180 +--
 admin/models/admin_views.php                  |   26 +-
 admin/models/fieldtype.php                    |   12 +-
 admin/models/forms/admin_view.js              |  456 +++---
 admin/models/forms/admin_view.xml             | 1169 +++++++--------
 admin/models/forms/custom_admin_view.js       |  354 ++---
 admin/models/forms/custom_code.js             |   76 +-
 admin/models/forms/dynamic_get.js             | 1252 ++++++++---------
 admin/models/forms/field.js                   |  428 +++---
 admin/models/forms/fieldtype.js               |  632 ++++-----
 admin/models/forms/help_document.js           |  234 +--
 admin/models/forms/layout.js                  |   20 +-
 admin/models/forms/library.js                 |  188 +--
 admin/models/forms/server.js                  |  560 ++++----
 admin/models/forms/site_view.js               |  350 ++---
 admin/models/forms/template.js                |   20 +-
 admin/models/server.php                       |    2 +-
 admin/sql/install.mysql.utf8.sql              |   27 +-
 admin/sql/updates/mysql/2.9.18.sql            |    3 +
 admin/views/admin_view/tmpl/edit.php          |  209 +--
 admin/views/custom_admin_view/tmpl/edit.php   |  100 +-
 admin/views/custom_code/tmpl/edit.php         |  114 +-
 admin/views/dynamic_get/tmpl/edit.php         |  336 ++---
 admin/views/field/tmpl/edit.php               |  132 +-
 admin/views/fieldtype/tmpl/edit.php           |  412 +++---
 admin/views/fieldtype/view.html.php           |    2 +-
 admin/views/help_document/tmpl/edit.php       |   54 +-
 admin/views/layout/tmpl/edit.php              |   10 +-
 admin/views/library/tmpl/edit.php             |   40 +-
 admin/views/server/tmpl/edit.php              |  156 +-
 admin/views/server/view.html.php              |    2 +-
 admin/views/site_view/tmpl/edit.php           |  110 +-
 admin/views/template/tmpl/edit.php            |   10 +-
 componentbuilder.xml                          |    6 +-
 componentbuilder_update_server.xml            |   17 +
 script.php                                    |   10 +-
 45 files changed, 3943 insertions(+), 3813 deletions(-)
 create mode 100644 admin/sql/updates/mysql/2.9.18.sql

diff --git a/README.md b/README.md
index de45167cb..088ed10a2 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.18) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.19) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -146,13 +146,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 11th June, 2019
-+ *Version*: 2.9.18
++ *Last Build*: 12th June, 2019
++ *Version*: 2.9.19
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206602**
-+ *Field count*: **1136**
-+ *File count*: **1344**
++ *Line count*: **206728**
++ *Field count*: **1138**
++ *File count*: **1345**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index de45167cb..088ed10a2 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.18) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.19) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -146,13 +146,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 11th June, 2019
-+ *Version*: 2.9.18
++ *Last Build*: 12th June, 2019
++ *Version*: 2.9.19
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206602**
-+ *Field count*: **1136**
-+ *File count*: **1344**
++ *Line count*: **206728**
++ *Field count*: **1138**
++ *File count*: **1345**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/JControllerForm.php
index 305a23fec..d5700c152 100644
--- a/admin/compiler/joomla_3/JControllerForm.php
+++ b/admin/compiler/joomla_3/JControllerForm.php
@@ -141,7 +141,7 @@ class ###Component###Controller###View### extends JControllerForm
 		$this->refid = $this->input->get('refid', 0, 'int');
 
 		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
+		$return = $this->input->get('return', null, 'base64');###JCONTROLLERFORM_BEFORECANCEL###
 
 		$cancel = parent::cancel($key);
 
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 3d5c81d8b..48fe02d08 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -2046,7 +2046,7 @@ class Get
 				}
 			}
 			// add_php
-			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
+			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_cancel', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
 			foreach ($addArrayP as $scripter)
 			{
 				if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1)
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index af5d955c4..cfe129b60 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -527,9 +527,13 @@ class Infusion extends Interpretation
 
 				// BATCH_ONCLICK_CANCEL_SCRIPT <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_list][$this->hhh . 'BATCH_ONCLICK_CANCEL_SCRIPT' . $this->hhh] = ''; // TODO <-- must still be build
+
 				// JCONTROLLERFORM_ALLOWADD <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_ALLOWADD' . $this->hhh] = $this->setJcontrollerAllowAdd($viewName_single, $viewName_list);
 
+				// JCONTROLLERFORM_BEFORECANCEL <<<DYNAMIC>>>
+				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_BEFORECANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_before_cancel', $viewName_single, PHP_EOL, null, null, '');
+
 				// JCONTROLLERFORM_ALLOWEDIT <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_ALLOWEDIT' . $this->hhh] = $this->setJcontrollerAllowEdit($viewName_single, $viewName_list);
 
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index ce57c939c..ca9b1b4d1 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -496,7 +496,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON="Add New + New & Close
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE="Add Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL="Add PHP (script - after delete)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH="Add Php After Publish"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL="Add PHP (script - after publish)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL="Add PHP (script - after state change)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX="Add Php Ajax"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL="Add PHP (AJAX)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWADD="Add Php Allowadd"
@@ -507,10 +507,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY="Add Php Batchcopy"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL="Add PHP (batchCopy Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE="Add Php Batchmove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL="Add PHP (batchMove Method)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_CANCEL="Add Php Before Cancel"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_CANCEL_LABEL="Add PHP (script - before cancel)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE="Add Php Before Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL="Add PHP (script - before delete)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH="Add Php Before Publish"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL="Add PHP (script - before publish)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL="Add PHP (script - before state change)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE="Add Php Before Save"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL="Add PHP (save Method - before data modeling)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
@@ -990,6 +992,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL="PHP batchCopy Method<br /><
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE="Php Batchmove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION="Add PHP Here that should run in the batchMove Method. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL="PHP batchMove Method<br /><small>submitted values are in $values, id's are in $pks</small>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_CANCEL="Php Before Cancel"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_CANCEL_DESCRIPTION="Add PHP Here that should run in the Cancel Method before cancel. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_CANCEL_LABEL="PHP Cancel Method before<br /><small>(string) $key is the name of the primary key of the URL variable.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE="Php Before Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION="Add PHP Here that should run in the delete Method before items are deleted. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL="PHP delete Method<br /><small>Target (array) $pks  is an array of record primary keys.</small>"
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index 0e66638d4..32e231549 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -38,6 +38,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_allowadd',
 	'add_php_allowedit',
 	'php_allowedit',
+	'add_php_before_cancel',
+	'php_before_cancel',
 	'add_php_batchcopy',
 	'php_batchcopy',
 	'add_php_batchmove',
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 9e78718bf..be5611b20 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->wapfields;
+$items = $displayData->waqfields;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
index 1b07ca66f..14a1587a7 100644
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->wazlinked_components;
+$items = $displayData->wbalinked_components;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index f456d2198..ae0ec90f7 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -86,12 +86,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_import_headers))
-			{
-				// base64 Decode php_import_headers.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
 			if (!empty($item->html_import_view))
 			{
 				// base64 Decode html_import_view.
@@ -104,10 +98,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
-			if (!empty($item->php_getitems))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_getitems.
-				$item->php_getitems = base64_decode($item->php_getitems);
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
 			}
 
 			if (!empty($item->php_getitems_after_all))
@@ -182,42 +176,48 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
+			if (!empty($item->php_before_cancel))
+			{
+				// base64 Decode php_before_cancel.
+				$item->php_before_cancel = base64_decode($item->php_before_cancel);
+			}
+
 			if (!empty($item->php_batchcopy))
 			{
 				// base64 Decode php_batchcopy.
 				$item->php_batchcopy = base64_decode($item->php_batchcopy);
 			}
 
-			if (!empty($item->php_batchmove))
-			{
-				// base64 Decode php_batchmove.
-				$item->php_batchmove = base64_decode($item->php_batchmove);
-			}
-
 			if (!empty($item->javascript_views_file))
 			{
 				// base64 Decode javascript_views_file.
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_batchmove))
+			{
+				// base64 Decode php_batchmove.
+				$item->php_batchmove = base64_decode($item->php_batchmove);
+			}
+
 			if (!empty($item->php_before_publish))
 			{
 				// base64 Decode php_before_publish.
 				$item->php_before_publish = base64_decode($item->php_before_publish);
 			}
 
-			if (!empty($item->php_after_publish))
-			{
-				// base64 Decode php_after_publish.
-				$item->php_after_publish = base64_decode($item->php_after_publish);
-			}
-
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_after_publish))
+			{
+				// base64 Decode php_after_publish.
+				$item->php_after_publish = base64_decode($item->php_after_publish);
+			}
+
 			if (!empty($item->php_before_delete))
 			{
 				// base64 Decode php_before_delete.
@@ -230,18 +230,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_after_delete = base64_decode($item->php_after_delete);
 			}
 
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
@@ -284,30 +284,28 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import = base64_decode($item->php_import);
 			}
 
-			if (!empty($item->php_import_setdata))
-			{
-				// base64 Decode php_import_setdata.
-				$item->php_import_setdata = base64_decode($item->php_import_setdata);
-			}
-
 			if (!empty($item->php_getitem))
 			{
 				// base64 Decode php_getitem.
 				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
+			if (!empty($item->php_import_setdata))
+			{
+				// base64 Decode php_import_setdata.
+				$item->php_import_setdata = base64_decode($item->php_import_setdata);
+			}
+
 			if (!empty($item->php_import_ext))
 			{
 				// base64 Decode php_import_ext.
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
-			if (!empty($item->addtables))
+			if (!empty($item->php_getitems))
 			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
+				// base64 Decode php_getitems.
+				$item->php_getitems = base64_decode($item->php_getitems);
 			}
 
 			if (!empty($item->addpermissions))
@@ -334,6 +332,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->addlinked_views = $addlinked_views->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->alias_builder))
 			{
 				// Convert the alias_builder field to an array.
@@ -1238,19 +1244,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1290,6 +1283,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['addlinked_views'] = '';
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the alias_builder items to data.
 		if (isset($data['alias_builder']) && is_array($data['alias_builder']))
 		{
@@ -1329,12 +1335,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_headers']))
-		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
 		// Set the html_import_view string to base64 string.
 		if (isset($data['html_import_view']))
 		{
@@ -1347,10 +1347,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
-		// Set the php_getitems string to base64 string.
-		if (isset($data['php_getitems']))
+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_getitems'] = base64_encode($data['php_getitems']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
 		}
 
 		// Set the php_getitems_after_all string to base64 string.
@@ -1425,42 +1425,48 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
+		// Set the php_before_cancel string to base64 string.
+		if (isset($data['php_before_cancel']))
+		{
+			$data['php_before_cancel'] = base64_encode($data['php_before_cancel']);
+		}
+
 		// Set the php_batchcopy string to base64 string.
 		if (isset($data['php_batchcopy']))
 		{
 			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
 		}
 
-		// Set the php_batchmove string to base64 string.
-		if (isset($data['php_batchmove']))
-		{
-			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
-		}
-
 		// Set the javascript_views_file string to base64 string.
 		if (isset($data['javascript_views_file']))
 		{
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_batchmove string to base64 string.
+		if (isset($data['php_batchmove']))
+		{
+			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+		}
+
 		// Set the php_before_publish string to base64 string.
 		if (isset($data['php_before_publish']))
 		{
 			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
 		}
 
-		// Set the php_after_publish string to base64 string.
-		if (isset($data['php_after_publish']))
-		{
-			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
-		}
-
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_after_publish string to base64 string.
+		if (isset($data['php_after_publish']))
+		{
+			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
+		}
+
 		// Set the php_before_delete string to base64 string.
 		if (isset($data['php_before_delete']))
 		{
@@ -1473,18 +1479,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
@@ -1527,22 +1533,28 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import'] = base64_encode($data['php_import']);
 		}
 
-		// Set the php_import_setdata string to base64 string.
-		if (isset($data['php_import_setdata']))
-		{
-			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
-		}
-
 		// Set the php_getitem string to base64 string.
 		if (isset($data['php_getitem']))
 		{
 			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
+		// Set the php_import_setdata string to base64 string.
+		if (isset($data['php_import_setdata']))
+		{
+			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
+		}
+
 		// Set the php_import_ext string to base64 string.
 		if (isset($data['php_import_ext']))
 		{
 			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
+		}
+
+		// Set the php_getitems string to base64 string.
+		if (isset($data['php_getitems']))
+		{
+			$data['php_getitems'] = base64_encode($data['php_getitems']);
 		}
         
 		// Set the Params Items to data
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 6ee4f09f9..d45f5217b 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -376,14 +376,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode html_import_view
 						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitems
-						$item->php_getitems = base64_decode($item->php_getitems);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode php_getitems_after_all
 						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// decode php_getlistquery
@@ -408,26 +406,28 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->php_allowedit = base64_decode($item->php_allowedit);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode php_before_cancel
+						$item->php_before_cancel = base64_decode($item->php_before_cancel);
 						// decode php_batchcopy
 						$item->php_batchcopy = base64_decode($item->php_batchcopy);
-						// decode php_batchmove
-						$item->php_batchmove = base64_decode($item->php_batchmove);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_batchmove
+						$item->php_batchmove = base64_decode($item->php_batchmove);
 						// decode php_before_publish
 						$item->php_before_publish = base64_decode($item->php_before_publish);
-						// decode php_after_publish
-						$item->php_after_publish = base64_decode($item->php_after_publish);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_after_publish
+						$item->php_after_publish = base64_decode($item->php_after_publish);
 						// decode php_before_delete
 						$item->php_before_delete = base64_decode($item->php_before_delete);
 						// decode php_after_delete
 						$item->php_after_delete = base64_decode($item->php_after_delete);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
 						// decode php_controller_list
@@ -442,12 +442,14 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->php_import_display = base64_decode($item->php_import_display);
 						// decode php_import
 						$item->php_import = base64_decode($item->php_import);
-						// decode php_import_setdata
-						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_getitem
 						$item->php_getitem = base64_decode($item->php_getitem);
+						// decode php_import_setdata
+						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
+						// decode php_getitems
+						$item->php_getitems = base64_decode($item->php_getitems);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 6a2d0300e..23c476ebb 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -155,7 +155,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWapfields()
+	public function getWaqfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -237,13 +237,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWapfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWaqfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWapfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWaqfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWapfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWaqfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWapfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWaqfields($item->store, 'store');
 				}
 			}
 
@@ -257,7 +257,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWapfields($value,$name)
+	public function selectionTranslationWaqfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index 8e894c1c6..7feaaf4f8 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -35,17 +35,18 @@ jform_vvvvvxxvxn_required = false;
 jform_vvvvvxyvxo_required = false;
 jform_vvvvvxzvxp_required = false;
 jform_vvvvvyavxq_required = false;
-jform_vvvvvyevxr_required = false;
-jform_vvvvvyevxs_required = false;
-jform_vvvvvyevxt_required = false;
-jform_vvvvvyevxu_required = false;
-jform_vvvvvyevxv_required = false;
-jform_vvvvvyevxw_required = false;
-jform_vvvvvyevxx_required = false;
-jform_vvvvvygvxy_required = false;
-jform_vvvvvygvxz_required = false;
-jform_vvvvvygvya_required = false;
-jform_vvvvvygvyb_required = false;
+jform_vvvvvybvxr_required = false;
+jform_vvvvvyfvxs_required = false;
+jform_vvvvvyfvxt_required = false;
+jform_vvvvvyfvxu_required = false;
+jform_vvvvvyfvxv_required = false;
+jform_vvvvvyfvxw_required = false;
+jform_vvvvvyfvxx_required = false;
+jform_vvvvvyfvxy_required = false;
+jform_vvvvvyhvxz_required = false;
+jform_vvvvvyhvya_required = false;
+jform_vvvvvyhvyb_required = false;
+jform_vvvvvyhvyc_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -101,46 +102,49 @@ jQuery(document).ready(function()
 	var add_php_allowedit_vvvvvxr = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
 	vvvvvxr(add_php_allowedit_vvvvvxr);
 
-	var add_php_batchcopy_vvvvvxs = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxs(add_php_batchcopy_vvvvvxs);
+	var add_php_before_cancel_vvvvvxs = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
+	vvvvvxs(add_php_before_cancel_vvvvvxs);
 
-	var add_php_batchmove_vvvvvxt = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchmove_vvvvvxt);
+	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxt(add_php_batchcopy_vvvvvxt);
 
-	var add_php_before_publish_vvvvvxu = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxu(add_php_before_publish_vvvvvxu);
+	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxu(add_php_batchmove_vvvvvxu);
 
-	var add_php_after_publish_vvvvvxv = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_after_publish_vvvvvxv);
+	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxv(add_php_before_publish_vvvvvxv);
 
-	var add_php_before_delete_vvvvvxw = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxw(add_php_before_delete_vvvvvxw);
+	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxw(add_php_after_publish_vvvvvxw);
 
-	var add_php_after_delete_vvvvvxx = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_after_delete_vvvvvxx);
+	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxx(add_php_before_delete_vvvvvxx);
 
-	var add_php_document_vvvvvxy = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxy(add_php_document_vvvvvxy);
+	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxy(add_php_after_delete_vvvvvxy);
 
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(add_sql_vvvvvxz);
+	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxz(add_php_document_vvvvvxz);
 
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	vvvvvya(add_sql_vvvvvya);
 
-	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
-	var add_custom_import_vvvvvye = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvye(add_custom_import_vvvvvye);
+	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
 
 	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
 	vvvvvyf(add_custom_import_vvvvvyf);
 
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	var add_custom_import_vvvvvyg = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyg(add_custom_import_vvvvvyg);
+
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyh(add_custom_button_vvvvvyh);
 });
 
 // the vvvvvxb function
@@ -690,298 +694,330 @@ function vvvvvxr(add_php_allowedit_vvvvvxr)
 }
 
 // the vvvvvxs function
-function vvvvvxs(add_php_batchcopy_vvvvvxs)
+function vvvvvxs(add_php_before_cancel_vvvvvxs)
 {
 	// set the function logic
-	if (add_php_batchcopy_vvvvvxs == 1)
+	if (add_php_before_cancel_vvvvvxs == 1)
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
-		// add required attribute to php_batchcopy field
+		jQuery('#jform_php_before_cancel-lbl').closest('.control-group').show();
+		// add required attribute to php_before_cancel field
 		if (jform_vvvvvxsvxi_required)
 		{
-			updateFieldRequired('php_batchcopy',0);
-			jQuery('#jform_php_batchcopy').prop('required','required');
-			jQuery('#jform_php_batchcopy').attr('aria-required',true);
-			jQuery('#jform_php_batchcopy').addClass('required');
+			updateFieldRequired('php_before_cancel',0);
+			jQuery('#jform_php_before_cancel').prop('required','required');
+			jQuery('#jform_php_before_cancel').attr('aria-required',true);
+			jQuery('#jform_php_before_cancel').addClass('required');
 			jform_vvvvvxsvxi_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
-		// remove required attribute from php_batchcopy field
+		jQuery('#jform_php_before_cancel-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_cancel field
 		if (!jform_vvvvvxsvxi_required)
 		{
-			updateFieldRequired('php_batchcopy',1);
-			jQuery('#jform_php_batchcopy').removeAttr('required');
-			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
-			jQuery('#jform_php_batchcopy').removeClass('required');
+			updateFieldRequired('php_before_cancel',1);
+			jQuery('#jform_php_before_cancel').removeAttr('required');
+			jQuery('#jform_php_before_cancel').removeAttr('aria-required');
+			jQuery('#jform_php_before_cancel').removeClass('required');
 			jform_vvvvvxsvxi_required = true;
 		}
 	}
 }
 
 // the vvvvvxt function
-function vvvvvxt(add_php_batchmove_vvvvvxt)
+function vvvvvxt(add_php_batchcopy_vvvvvxt)
 {
 	// set the function logic
-	if (add_php_batchmove_vvvvvxt == 1)
+	if (add_php_batchcopy_vvvvvxt == 1)
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
-		// add required attribute to php_batchmove field
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
+		// add required attribute to php_batchcopy field
 		if (jform_vvvvvxtvxj_required)
 		{
-			updateFieldRequired('php_batchmove',0);
-			jQuery('#jform_php_batchmove').prop('required','required');
-			jQuery('#jform_php_batchmove').attr('aria-required',true);
-			jQuery('#jform_php_batchmove').addClass('required');
+			updateFieldRequired('php_batchcopy',0);
+			jQuery('#jform_php_batchcopy').prop('required','required');
+			jQuery('#jform_php_batchcopy').attr('aria-required',true);
+			jQuery('#jform_php_batchcopy').addClass('required');
 			jform_vvvvvxtvxj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
-		// remove required attribute from php_batchmove field
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
+		// remove required attribute from php_batchcopy field
 		if (!jform_vvvvvxtvxj_required)
 		{
-			updateFieldRequired('php_batchmove',1);
-			jQuery('#jform_php_batchmove').removeAttr('required');
-			jQuery('#jform_php_batchmove').removeAttr('aria-required');
-			jQuery('#jform_php_batchmove').removeClass('required');
+			updateFieldRequired('php_batchcopy',1);
+			jQuery('#jform_php_batchcopy').removeAttr('required');
+			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
+			jQuery('#jform_php_batchcopy').removeClass('required');
 			jform_vvvvvxtvxj_required = true;
 		}
 	}
 }
 
 // the vvvvvxu function
-function vvvvvxu(add_php_before_publish_vvvvvxu)
+function vvvvvxu(add_php_batchmove_vvvvvxu)
 {
 	// set the function logic
-	if (add_php_before_publish_vvvvvxu == 1)
+	if (add_php_batchmove_vvvvvxu == 1)
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
-		// add required attribute to php_before_publish field
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
+		// add required attribute to php_batchmove field
 		if (jform_vvvvvxuvxk_required)
 		{
-			updateFieldRequired('php_before_publish',0);
-			jQuery('#jform_php_before_publish').prop('required','required');
-			jQuery('#jform_php_before_publish').attr('aria-required',true);
-			jQuery('#jform_php_before_publish').addClass('required');
+			updateFieldRequired('php_batchmove',0);
+			jQuery('#jform_php_batchmove').prop('required','required');
+			jQuery('#jform_php_batchmove').attr('aria-required',true);
+			jQuery('#jform_php_batchmove').addClass('required');
 			jform_vvvvvxuvxk_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_publish field
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
+		// remove required attribute from php_batchmove field
 		if (!jform_vvvvvxuvxk_required)
 		{
-			updateFieldRequired('php_before_publish',1);
-			jQuery('#jform_php_before_publish').removeAttr('required');
-			jQuery('#jform_php_before_publish').removeAttr('aria-required');
-			jQuery('#jform_php_before_publish').removeClass('required');
+			updateFieldRequired('php_batchmove',1);
+			jQuery('#jform_php_batchmove').removeAttr('required');
+			jQuery('#jform_php_batchmove').removeAttr('aria-required');
+			jQuery('#jform_php_batchmove').removeClass('required');
 			jform_vvvvvxuvxk_required = true;
 		}
 	}
 }
 
 // the vvvvvxv function
-function vvvvvxv(add_php_after_publish_vvvvvxv)
+function vvvvvxv(add_php_before_publish_vvvvvxv)
 {
 	// set the function logic
-	if (add_php_after_publish_vvvvvxv == 1)
+	if (add_php_before_publish_vvvvvxv == 1)
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
-		// add required attribute to php_after_publish field
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
+		// add required attribute to php_before_publish field
 		if (jform_vvvvvxvvxl_required)
 		{
-			updateFieldRequired('php_after_publish',0);
-			jQuery('#jform_php_after_publish').prop('required','required');
-			jQuery('#jform_php_after_publish').attr('aria-required',true);
-			jQuery('#jform_php_after_publish').addClass('required');
+			updateFieldRequired('php_before_publish',0);
+			jQuery('#jform_php_before_publish').prop('required','required');
+			jQuery('#jform_php_before_publish').attr('aria-required',true);
+			jQuery('#jform_php_before_publish').addClass('required');
 			jform_vvvvvxvvxl_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_publish field
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_publish field
 		if (!jform_vvvvvxvvxl_required)
 		{
-			updateFieldRequired('php_after_publish',1);
-			jQuery('#jform_php_after_publish').removeAttr('required');
-			jQuery('#jform_php_after_publish').removeAttr('aria-required');
-			jQuery('#jform_php_after_publish').removeClass('required');
+			updateFieldRequired('php_before_publish',1);
+			jQuery('#jform_php_before_publish').removeAttr('required');
+			jQuery('#jform_php_before_publish').removeAttr('aria-required');
+			jQuery('#jform_php_before_publish').removeClass('required');
 			jform_vvvvvxvvxl_required = true;
 		}
 	}
 }
 
 // the vvvvvxw function
-function vvvvvxw(add_php_before_delete_vvvvvxw)
+function vvvvvxw(add_php_after_publish_vvvvvxw)
 {
 	// set the function logic
-	if (add_php_before_delete_vvvvvxw == 1)
+	if (add_php_after_publish_vvvvvxw == 1)
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
-		// add required attribute to php_before_delete field
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
+		// add required attribute to php_after_publish field
 		if (jform_vvvvvxwvxm_required)
 		{
-			updateFieldRequired('php_before_delete',0);
-			jQuery('#jform_php_before_delete').prop('required','required');
-			jQuery('#jform_php_before_delete').attr('aria-required',true);
-			jQuery('#jform_php_before_delete').addClass('required');
+			updateFieldRequired('php_after_publish',0);
+			jQuery('#jform_php_after_publish').prop('required','required');
+			jQuery('#jform_php_after_publish').attr('aria-required',true);
+			jQuery('#jform_php_after_publish').addClass('required');
 			jform_vvvvvxwvxm_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_delete field
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_publish field
 		if (!jform_vvvvvxwvxm_required)
 		{
-			updateFieldRequired('php_before_delete',1);
-			jQuery('#jform_php_before_delete').removeAttr('required');
-			jQuery('#jform_php_before_delete').removeAttr('aria-required');
-			jQuery('#jform_php_before_delete').removeClass('required');
+			updateFieldRequired('php_after_publish',1);
+			jQuery('#jform_php_after_publish').removeAttr('required');
+			jQuery('#jform_php_after_publish').removeAttr('aria-required');
+			jQuery('#jform_php_after_publish').removeClass('required');
 			jform_vvvvvxwvxm_required = true;
 		}
 	}
 }
 
 // the vvvvvxx function
-function vvvvvxx(add_php_after_delete_vvvvvxx)
+function vvvvvxx(add_php_before_delete_vvvvvxx)
 {
 	// set the function logic
-	if (add_php_after_delete_vvvvvxx == 1)
+	if (add_php_before_delete_vvvvvxx == 1)
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
-		// add required attribute to php_after_delete field
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
+		// add required attribute to php_before_delete field
 		if (jform_vvvvvxxvxn_required)
 		{
-			updateFieldRequired('php_after_delete',0);
-			jQuery('#jform_php_after_delete').prop('required','required');
-			jQuery('#jform_php_after_delete').attr('aria-required',true);
-			jQuery('#jform_php_after_delete').addClass('required');
+			updateFieldRequired('php_before_delete',0);
+			jQuery('#jform_php_before_delete').prop('required','required');
+			jQuery('#jform_php_before_delete').attr('aria-required',true);
+			jQuery('#jform_php_before_delete').addClass('required');
 			jform_vvvvvxxvxn_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_delete field
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_delete field
 		if (!jform_vvvvvxxvxn_required)
 		{
-			updateFieldRequired('php_after_delete',1);
-			jQuery('#jform_php_after_delete').removeAttr('required');
-			jQuery('#jform_php_after_delete').removeAttr('aria-required');
-			jQuery('#jform_php_after_delete').removeClass('required');
+			updateFieldRequired('php_before_delete',1);
+			jQuery('#jform_php_before_delete').removeAttr('required');
+			jQuery('#jform_php_before_delete').removeAttr('aria-required');
+			jQuery('#jform_php_before_delete').removeClass('required');
 			jform_vvvvvxxvxn_required = true;
 		}
 	}
 }
 
 // the vvvvvxy function
-function vvvvvxy(add_php_document_vvvvvxy)
+function vvvvvxy(add_php_after_delete_vvvvvxy)
 {
 	// set the function logic
-	if (add_php_document_vvvvvxy == 1)
+	if (add_php_after_delete_vvvvvxy == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
+		// add required attribute to php_after_delete field
 		if (jform_vvvvvxyvxo_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_after_delete',0);
+			jQuery('#jform_php_after_delete').prop('required','required');
+			jQuery('#jform_php_after_delete').attr('aria-required',true);
+			jQuery('#jform_php_after_delete').addClass('required');
 			jform_vvvvvxyvxo_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_delete field
 		if (!jform_vvvvvxyvxo_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_after_delete',1);
+			jQuery('#jform_php_after_delete').removeAttr('required');
+			jQuery('#jform_php_after_delete').removeAttr('aria-required');
+			jQuery('#jform_php_after_delete').removeClass('required');
 			jform_vvvvvxyvxo_required = true;
 		}
 	}
 }
 
 // the vvvvvxz function
-function vvvvvxz(add_sql_vvvvvxz)
+function vvvvvxz(add_php_document_vvvvvxz)
 {
 	// set the function logic
-	if (add_sql_vvvvvxz == 1)
+	if (add_php_document_vvvvvxz == 1)
 	{
-		jQuery('#jform_source').closest('.control-group').show();
-		// add required attribute to source field
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		// add required attribute to php_document field
 		if (jform_vvvvvxzvxp_required)
 		{
-			updateFieldRequired('source',0);
-			jQuery('#jform_source').prop('required','required');
-			jQuery('#jform_source').attr('aria-required',true);
-			jQuery('#jform_source').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvxzvxp_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_source').closest('.control-group').hide();
-		// remove required attribute from source field
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		// remove required attribute from php_document field
 		if (!jform_vvvvvxzvxp_required)
 		{
-			updateFieldRequired('source',1);
-			jQuery('#jform_source').removeAttr('required');
-			jQuery('#jform_source').removeAttr('aria-required');
-			jQuery('#jform_source').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvxzvxp_required = true;
 		}
 	}
 }
 
 // the vvvvvya function
-function vvvvvya(source_vvvvvya,add_sql_vvvvvya)
+function vvvvvya(add_sql_vvvvvya)
 {
 	// set the function logic
-	if (source_vvvvvya == 2 && add_sql_vvvvvya == 1)
+	if (add_sql_vvvvvya == 1)
+	{
+		jQuery('#jform_source').closest('.control-group').show();
+		// add required attribute to source field
+		if (jform_vvvvvyavxq_required)
+		{
+			updateFieldRequired('source',0);
+			jQuery('#jform_source').prop('required','required');
+			jQuery('#jform_source').attr('aria-required',true);
+			jQuery('#jform_source').addClass('required');
+			jform_vvvvvyavxq_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_source').closest('.control-group').hide();
+		// remove required attribute from source field
+		if (!jform_vvvvvyavxq_required)
+		{
+			updateFieldRequired('source',1);
+			jQuery('#jform_source').removeAttr('required');
+			jQuery('#jform_source').removeAttr('aria-required');
+			jQuery('#jform_source').removeClass('required');
+			jform_vvvvvyavxq_required = true;
+		}
+	}
+}
+
+// the vvvvvyb function
+function vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb)
+{
+	// set the function logic
+	if (source_vvvvvyb == 2 && add_sql_vvvvvyb == 1)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvyavxq_required)
+		if (jform_vvvvvybvxr_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvyavxq_required = false;
+			jform_vvvvvybvxr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvyavxq_required)
+		if (!jform_vvvvvybvxr_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvyavxq_required = true;
+			jform_vvvvvybvxr_required = true;
 		}
 	}
 }
 
-// the vvvvvyc function
-function vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc)
+// the vvvvvyd function
+function vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd)
 {
 	// set the function logic
-	if (source_vvvvvyc == 1 && add_sql_vvvvvyc == 1)
+	if (source_vvvvvyd == 1 && add_sql_vvvvvyd == 1)
 	{
 		jQuery('#jform_addtables-lbl').closest('.control-group').show();
 	}
@@ -991,165 +1027,165 @@ function vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc)
 	}
 }
 
-// the vvvvvye function
-function vvvvvye(add_custom_import_vvvvvye)
+// the vvvvvyf function
+function vvvvvyf(add_custom_import_vvvvvyf)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvye == 1)
+	if (add_custom_import_vvvvvyf == 1)
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').show();
 		// add required attribute to html_import_view field
-		if (jform_vvvvvyevxr_required)
+		if (jform_vvvvvyfvxs_required)
 		{
 			updateFieldRequired('html_import_view',0);
 			jQuery('#jform_html_import_view').prop('required','required');
 			jQuery('#jform_html_import_view').attr('aria-required',true);
 			jQuery('#jform_html_import_view').addClass('required');
-			jform_vvvvvyevxr_required = false;
+			jform_vvvvvyfvxs_required = false;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').show();
 		jQuery('#jform_php_import_display').closest('.control-group').show();
 		// add required attribute to php_import_display field
-		if (jform_vvvvvyevxs_required)
+		if (jform_vvvvvyfvxt_required)
 		{
 			updateFieldRequired('php_import_display',0);
 			jQuery('#jform_php_import_display').prop('required','required');
 			jQuery('#jform_php_import_display').attr('aria-required',true);
 			jQuery('#jform_php_import_display').addClass('required');
-			jform_vvvvvyevxs_required = false;
+			jform_vvvvvyfvxt_required = false;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').show();
 		// add required attribute to php_import_ext field
-		if (jform_vvvvvyevxt_required)
+		if (jform_vvvvvyfvxu_required)
 		{
 			updateFieldRequired('php_import_ext',0);
 			jQuery('#jform_php_import_ext').prop('required','required');
 			jQuery('#jform_php_import_ext').attr('aria-required',true);
 			jQuery('#jform_php_import_ext').addClass('required');
-			jform_vvvvvyevxt_required = false;
+			jform_vvvvvyfvxu_required = false;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		// add required attribute to php_import_headers field
-		if (jform_vvvvvyevxu_required)
+		if (jform_vvvvvyfvxv_required)
 		{
 			updateFieldRequired('php_import_headers',0);
 			jQuery('#jform_php_import_headers').prop('required','required');
 			jQuery('#jform_php_import_headers').attr('aria-required',true);
 			jQuery('#jform_php_import_headers').addClass('required');
-			jform_vvvvvyevxu_required = false;
+			jform_vvvvvyfvxv_required = false;
 		}
 		jQuery('#jform_php_import').closest('.control-group').show();
 		// add required attribute to php_import field
-		if (jform_vvvvvyevxv_required)
+		if (jform_vvvvvyfvxw_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvvyevxv_required = false;
+			jform_vvvvvyfvxw_required = false;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').show();
 		// add required attribute to php_import_save field
-		if (jform_vvvvvyevxw_required)
+		if (jform_vvvvvyfvxx_required)
 		{
 			updateFieldRequired('php_import_save',0);
 			jQuery('#jform_php_import_save').prop('required','required');
 			jQuery('#jform_php_import_save').attr('aria-required',true);
 			jQuery('#jform_php_import_save').addClass('required');
-			jform_vvvvvyevxw_required = false;
+			jform_vvvvvyfvxx_required = false;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
 		// add required attribute to php_import_setdata field
-		if (jform_vvvvvyevxx_required)
+		if (jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_import_setdata',0);
 			jQuery('#jform_php_import_setdata').prop('required','required');
 			jQuery('#jform_php_import_setdata').attr('aria-required',true);
 			jQuery('#jform_php_import_setdata').addClass('required');
-			jform_vvvvvyevxx_required = false;
+			jform_vvvvvyfvxy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').hide();
 		// remove required attribute from html_import_view field
-		if (!jform_vvvvvyevxr_required)
+		if (!jform_vvvvvyfvxs_required)
 		{
 			updateFieldRequired('html_import_view',1);
 			jQuery('#jform_html_import_view').removeAttr('required');
 			jQuery('#jform_html_import_view').removeAttr('aria-required');
 			jQuery('#jform_html_import_view').removeClass('required');
-			jform_vvvvvyevxr_required = true;
+			jform_vvvvvyfvxs_required = true;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').hide();
 		jQuery('#jform_php_import_display').closest('.control-group').hide();
 		// remove required attribute from php_import_display field
-		if (!jform_vvvvvyevxs_required)
+		if (!jform_vvvvvyfvxt_required)
 		{
 			updateFieldRequired('php_import_display',1);
 			jQuery('#jform_php_import_display').removeAttr('required');
 			jQuery('#jform_php_import_display').removeAttr('aria-required');
 			jQuery('#jform_php_import_display').removeClass('required');
-			jform_vvvvvyevxs_required = true;
+			jform_vvvvvyfvxt_required = true;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').hide();
 		// remove required attribute from php_import_ext field
-		if (!jform_vvvvvyevxt_required)
+		if (!jform_vvvvvyfvxu_required)
 		{
 			updateFieldRequired('php_import_ext',1);
 			jQuery('#jform_php_import_ext').removeAttr('required');
 			jQuery('#jform_php_import_ext').removeAttr('aria-required');
 			jQuery('#jform_php_import_ext').removeClass('required');
-			jform_vvvvvyevxt_required = true;
+			jform_vvvvvyfvxu_required = true;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		// remove required attribute from php_import_headers field
-		if (!jform_vvvvvyevxu_required)
+		if (!jform_vvvvvyfvxv_required)
 		{
 			updateFieldRequired('php_import_headers',1);
 			jQuery('#jform_php_import_headers').removeAttr('required');
 			jQuery('#jform_php_import_headers').removeAttr('aria-required');
 			jQuery('#jform_php_import_headers').removeClass('required');
-			jform_vvvvvyevxu_required = true;
+			jform_vvvvvyfvxv_required = true;
 		}
 		jQuery('#jform_php_import').closest('.control-group').hide();
 		// remove required attribute from php_import field
-		if (!jform_vvvvvyevxv_required)
+		if (!jform_vvvvvyfvxw_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvvyevxv_required = true;
+			jform_vvvvvyfvxw_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
 		// remove required attribute from php_import_save field
-		if (!jform_vvvvvyevxw_required)
+		if (!jform_vvvvvyfvxx_required)
 		{
 			updateFieldRequired('php_import_save',1);
 			jQuery('#jform_php_import_save').removeAttr('required');
 			jQuery('#jform_php_import_save').removeAttr('aria-required');
 			jQuery('#jform_php_import_save').removeClass('required');
-			jform_vvvvvyevxw_required = true;
+			jform_vvvvvyfvxx_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
 		// remove required attribute from php_import_setdata field
-		if (!jform_vvvvvyevxx_required)
+		if (!jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_import_setdata',1);
 			jQuery('#jform_php_import_setdata').removeAttr('required');
 			jQuery('#jform_php_import_setdata').removeAttr('aria-required');
 			jQuery('#jform_php_import_setdata').removeClass('required');
-			jform_vvvvvyevxx_required = true;
+			jform_vvvvvyfvxy_required = true;
 		}
 	}
 }
 
-// the vvvvvyf function
-function vvvvvyf(add_custom_import_vvvvvyf)
+// the vvvvvyg function
+function vvvvvyg(add_custom_import_vvvvvyg)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyf == 0)
+	if (add_custom_import_vvvvvyg == 0)
 	{
 		jQuery('.note_beginner_import').closest('.control-group').show();
 	}
@@ -1159,52 +1195,52 @@ function vvvvvyf(add_custom_import_vvvvvyf)
 	}
 }
 
-// the vvvvvyg function
-function vvvvvyg(add_custom_button_vvvvvyg)
+// the vvvvvyh function
+function vvvvvyh(add_custom_button_vvvvvyh)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyg == 1)
+	if (add_custom_button_vvvvvyh == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvygvxy_required)
+		if (jform_vvvvvyhvxz_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvygvxy_required = false;
+			jform_vvvvvyhvxz_required = false;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').show();
 		// add required attribute to php_controller_list field
-		if (jform_vvvvvygvxz_required)
+		if (jform_vvvvvyhvya_required)
 		{
 			updateFieldRequired('php_controller_list',0);
 			jQuery('#jform_php_controller_list').prop('required','required');
 			jQuery('#jform_php_controller_list').attr('aria-required',true);
 			jQuery('#jform_php_controller_list').addClass('required');
-			jform_vvvvvygvxz_required = false;
+			jform_vvvvvyhvya_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvygvya_required)
+		if (jform_vvvvvyhvyb_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvygvya_required = false;
+			jform_vvvvvyhvyb_required = false;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').show();
 		// add required attribute to php_model_list field
-		if (jform_vvvvvygvyb_required)
+		if (jform_vvvvvyhvyc_required)
 		{
 			updateFieldRequired('php_model_list',0);
 			jQuery('#jform_php_model_list').prop('required','required');
 			jQuery('#jform_php_model_list').attr('aria-required',true);
 			jQuery('#jform_php_model_list').addClass('required');
-			jform_vvvvvygvyb_required = false;
+			jform_vvvvvyhvyc_required = false;
 		}
 	}
 	else
@@ -1212,43 +1248,43 @@ function vvvvvyg(add_custom_button_vvvvvyg)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvygvxy_required)
+		if (!jform_vvvvvyhvxz_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvygvxy_required = true;
+			jform_vvvvvyhvxz_required = true;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller_list field
-		if (!jform_vvvvvygvxz_required)
+		if (!jform_vvvvvyhvya_required)
 		{
 			updateFieldRequired('php_controller_list',1);
 			jQuery('#jform_php_controller_list').removeAttr('required');
 			jQuery('#jform_php_controller_list').removeAttr('aria-required');
 			jQuery('#jform_php_controller_list').removeClass('required');
-			jform_vvvvvygvxz_required = true;
+			jform_vvvvvyhvya_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvygvya_required)
+		if (!jform_vvvvvyhvyb_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvygvya_required = true;
+			jform_vvvvvyhvyb_required = true;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model_list field
-		if (!jform_vvvvvygvyb_required)
+		if (!jform_vvvvvyhvyc_required)
 		{
 			updateFieldRequired('php_model_list',1);
 			jQuery('#jform_php_model_list').removeAttr('required');
 			jQuery('#jform_php_model_list').removeAttr('aria-required');
 			jQuery('#jform_php_model_list').removeClass('required');
-			jform_vvvvvygvyb_required = true;
+			jform_vvvvvyhvyc_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 0b3278446..f140bd015 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -129,11 +129,11 @@
 			message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT"
 		/>
-		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_cancel Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
+			name="add_php_before_cancel"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_CANCEL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -207,11 +207,11 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
+		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			name="add_php_after_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -265,6 +265,304 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
 			directory=""
 		/>
+		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_batchmove"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_after_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="html_import_view"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+			required="true"
+		/>
+		<!-- Mysql_table_engine Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="mysql_table_engine"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION"
+			class="list_class bestview"
+			multiple="false"
+			filter="CMD"
+			required="true"
+			default="InnoDB">
+			<!-- Option Set. -->
+			<option value="MyISAM">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM</option>
+			<option value="InnoDB">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_INNODB</option>
+			<option value="MEMORY">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_MEMORY</option>
+			<option value="ARCHIVE">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE</option>
+			<option value="PERFORMANCE_SCHEMA">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_PERFORMANCE_SCHEMA</option>
+		</field>
+		<!-- Type Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="type"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION"
+			class="btn-group"
+			filter="INT"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY</option>
+		</field>
+		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
+			required="true"
+		/>
+		<!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_permissions" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_permissions" />
+		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_getlistquery"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Addpermissions Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="addpermissions"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION"
+			icon="list">
+			<form hidden="true" name="list_addpermissions_modal" repeat="true">
+				<!-- Action Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="action"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					filter="CMD"
+					required="true"
+					default="">
+					<!-- Option Set. -->
+					<option value="core.edit">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT</option>
+					<option value="core.edit.own">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN</option>
+					<option value="core.edit.state">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE</option>
+					<option value="core.edit.access">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITACCESS</option>
+					<option value="core.edit.created_by">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY</option>
+					<option value="core.edit.created">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED</option>
+					<option value="core.create">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE</option>
+					<option value="core.delete">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE</option>
+					<option value="view.edit">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDIT</option>
+					<option value="view.edit.own">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN</option>
+					<option value="view.edit.state">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITSTATE</option>
+					<option value="view.edit.access">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITACCESS</option>
+					<option value="view.edit.created_by">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY</option>
+					<option value="view.edit.created">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED</option>
+					<option value="view.create">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWCREATE</option>
+					<option value="view.delete">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWDELETE</option>
+					<option value="view.access">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS</option>
+				</field>
+				<!-- Implementation Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="implementation"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					filter="INT"
+					default="1">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_EACH_RECORD</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_THE_WHOLE_VIEW</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_BOTH</option>
+				</field>
+			</form>
+		</field>
+		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_before_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
+		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_postsavehook"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Addtabs Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="addtabs"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION"
+			default=""
+			icon="list">
+			<form hidden="true" name="list_addtabs_modal" repeat="true">
+				<!-- Name Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="name"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="true"
+					filter="STRING"
+					message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT"
+				/>
+			</form>
+		</field>
+		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_allowedit"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_custom_tabs_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_custom_tabs_note" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CUSTOM_TABS_NOTE_DESCRIPTION" heading="h5" class="alert alert-success note_custom_tabs_note" />
+		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_batchcopy"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" />
 		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -279,39 +577,92 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Addtables Field. Type: Subform. (joomla) -->
+		<!-- Addlinked_views Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
-			name="addtables"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
+			name="addlinked_views"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			default=""
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
 			icon="list">
-			<form hidden="true" name="list_addtables_modal" repeat="true">
-				<!-- Table Field. Type: Dbtables. (custom) -->
+			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
+				<!-- Adminview Field. Type: Adminviews. (custom) -->
 				<field
-					type="dbtables"
-					name="table"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL"
-					class="list_class"
+					type="adminviews"
+					name="adminview"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
+					class="fieldMedium"
 					multiple="false"
-					default="0"
+					default=""
+					required="true"
 					button="false"
 				/>
-				<!-- Sourcemap Field. Type: Textarea. (joomla) -->
+				<!-- Tab Field. Type: Integer. (joomla) -->
 				<field
-					type="textarea"
-					name="sourcemap"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
-					rows="22"
-					cols="30"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
-					class="text_area span4"
-					filter="HTML"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
-					required="true"
+					type="integer"
+					name="tab"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL"
+					default="1"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION"
+					class="fieldSmall"
+					first="1"
+					last="14"
+					step="1"
 				/>
+				<!-- Key Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="key"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="true"
+					filter="WORD"
+					message="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT"
+				/>
+				<!-- Parentkey Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="parentkey"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="true"
+					filter="WORD"
+					message="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_MESSAGE"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT"
+				/>
+				<!-- Addnew Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="addnew"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					filter="int"
+					default="0">
+					<!-- Option Set. -->
+					<option value="0">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_NONE</option>
+					<option value="1">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON</option>
+				</field>
 			</form>
 		</field>
 		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
@@ -328,19 +679,36 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import_headers Field. Type: Textarea. (joomla) -->
+		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-info note_create_edit_notice" />
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="php_import_headers"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
-			required="true"
-		/>
+			type="radio"
+			name="add_php_document"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Alias_builder_type Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="alias_builder_type"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM</option>
+		</field>
 		<!-- Mysql_table_collate Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -798,21 +1166,45 @@
 			<option value="gb18030_unicode_520_ci">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY</option>
 		</field>
-		<!-- Type Field. Type: List. (joomla) -->
+		<!-- Note_alias_builder_custom Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_alias_builder_custom" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_custom" showon="alias_builder_type:2" />
+		<!-- Addtables Field. Type: Subform. (joomla) -->
 		<field
-			type="list"
-			name="type"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION"
-			class="btn-group"
-			filter="INT"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY</option>
+			type="subform"
+			name="addtables"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			default=""
+			icon="list">
+			<form hidden="true" name="list_addtables_modal" repeat="true">
+				<!-- Table Field. Type: Dbtables. (custom) -->
+				<field
+					type="dbtables"
+					name="table"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL"
+					class="list_class"
+					multiple="false"
+					default="0"
+					button="false"
+				/>
+				<!-- Sourcemap Field. Type: Textarea. (joomla) -->
+				<field
+					type="textarea"
+					name="sourcemap"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
+					rows="22"
+					cols="30"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
+					class="text_area span4"
+					filter="HTML"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
+					required="true"
+				/>
+			</form>
 		</field>
+		<!-- Note_alias_builder_default Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_alias_builder_default" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_default" showon="alias_builder_type:1" />
 		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -828,12 +1220,31 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<!-- Alias_builder Field. Type: Aliasbuilder. (custom) -->
 		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
+			type="aliasbuilder"
+			name="alias_builder"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_DESCRIPTION"
+			class="list_class fieldFull"
+			multiple="true"
+			showon="alias_builder_type:2"
 		/>
+		<!-- Php_import_headers Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_headers"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
+			required="true"
+		/>
+		<!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_create_edit_buttons" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION" class="note_create_edit_buttons" />
 		<!-- Name_list Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -850,420 +1261,6 @@
 			message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_MESSAGE"
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_HINT"
 		/>
-		<!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_permissions" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_permissions" />
-		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_getlistquery"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Addpermissions Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="addpermissions"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION"
-			icon="list">
-			<form hidden="true" name="list_addpermissions_modal" repeat="true">
-				<!-- Action Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="action"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					filter="CMD"
-					required="true"
-					default="">
-					<!-- Option Set. -->
-					<option value="core.edit">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT</option>
-					<option value="core.edit.own">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN</option>
-					<option value="core.edit.state">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE</option>
-					<option value="core.edit.access">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITACCESS</option>
-					<option value="core.edit.created_by">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY</option>
-					<option value="core.edit.created">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED</option>
-					<option value="core.create">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE</option>
-					<option value="core.delete">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE</option>
-					<option value="view.edit">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDIT</option>
-					<option value="view.edit.own">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN</option>
-					<option value="view.edit.state">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITSTATE</option>
-					<option value="view.edit.access">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITACCESS</option>
-					<option value="view.edit.created_by">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY</option>
-					<option value="view.edit.created">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED</option>
-					<option value="view.create">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWCREATE</option>
-					<option value="view.delete">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWDELETE</option>
-					<option value="view.access">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS</option>
-				</field>
-				<!-- Implementation Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="implementation"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					filter="INT"
-					default="1">
-					<!-- Option Set. -->
-					<option value="1">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_EACH_RECORD</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_THE_WHOLE_VIEW</option>
-					<option value="3">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_BOTH</option>
-				</field>
-			</form>
-		</field>
-		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_before_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
-		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postsavehook"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Addtabs Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="addtabs"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION"
-			default=""
-			icon="list">
-			<form hidden="true" name="list_addtabs_modal" repeat="true">
-				<!-- Name Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="name"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION"
-					class="text_area"
-					readonly="false"
-					disabled="false"
-					required="true"
-					filter="STRING"
-					message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT"
-				/>
-			</form>
-		</field>
-		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_custom_tabs_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_custom_tabs_note" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CUSTOM_TABS_NOTE_DESCRIPTION" heading="h5" class="alert alert-success note_custom_tabs_note" />
-		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" />
-		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Addlinked_views Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="addlinked_views"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
-			icon="list">
-			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
-				<!-- Adminview Field. Type: Adminviews. (custom) -->
-				<field
-					type="adminviews"
-					name="adminview"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
-					class="fieldMedium"
-					multiple="false"
-					default=""
-					required="true"
-					button="false"
-				/>
-				<!-- Tab Field. Type: Integer. (joomla) -->
-				<field
-					type="integer"
-					name="tab"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL"
-					default="1"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION"
-					class="fieldSmall"
-					first="1"
-					last="14"
-					step="1"
-				/>
-				<!-- Key Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="key"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION"
-					class="text_area"
-					readonly="false"
-					disabled="false"
-					required="true"
-					filter="WORD"
-					message="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT"
-				/>
-				<!-- Parentkey Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="parentkey"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_DESCRIPTION"
-					class="text_area"
-					readonly="false"
-					disabled="false"
-					required="true"
-					filter="WORD"
-					message="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_MESSAGE"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT"
-				/>
-				<!-- Addnew Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="addnew"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					filter="int"
-					default="0">
-					<!-- Option Set. -->
-					<option value="0">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_NONE</option>
-					<option value="1">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON</option>
-					<option value="3">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON</option>
-				</field>
-			</form>
-		</field>
-		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-info note_create_edit_notice" />
-		<!-- Mysql_table_engine Field. Type: List. (joomla) -->
-		<field
-			type="list"
-			name="mysql_table_engine"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION"
-			class="list_class bestview"
-			multiple="false"
-			filter="CMD"
-			required="true"
-			default="InnoDB">
-			<!-- Option Set. -->
-			<option value="MyISAM">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM</option>
-			<option value="InnoDB">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_INNODB</option>
-			<option value="MEMORY">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_MEMORY</option>
-			<option value="ARCHIVE">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE</option>
-			<option value="PERFORMANCE_SCHEMA">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_PERFORMANCE_SCHEMA</option>
-		</field>
-		<!-- Alias_builder_type Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="alias_builder_type"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM</option>
-		</field>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_alias_builder_custom Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_alias_builder_custom" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_custom" showon="alias_builder_type:2" />
-		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
-		<!-- Note_alias_builder_default Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_alias_builder_default" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_default" showon="alias_builder_type:1" />
-		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="html_import_view"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
-			required="true"
-		/>
-		<!-- Alias_builder Field. Type: Aliasbuilder. (custom) -->
-		<field
-			type="aliasbuilder"
-			name="alias_builder"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_DESCRIPTION"
-			class="list_class fieldFull"
-			multiple="true"
-			showon="alias_builder_type:2"
-		/>
-		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
-			required="true"
-		/>
-		<!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_create_edit_buttons" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION" class="note_create_edit_buttons" />
-		<!-- Php_getitems Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_getitems"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="true"
-			validate="code"
-		/>
 		<!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_display" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION" class="note_create_edit_display" />
 		<!-- Php_getitems_after_all Field. Type: Editor. (joomla) -->
@@ -1526,12 +1523,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
+		<!-- Php_before_cancel Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
+			name="php_before_cancel"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_CANCEL_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_CANCEL_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1557,12 +1554,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
+		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
+			name="php_batchcopy"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1591,12 +1588,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
+			name="php_batchmove"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1622,12 +1619,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
+			name="php_before_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1656,12 +1653,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
+			name="php_after_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1687,12 +1684,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
+			name="php_before_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -2212,6 +2209,40 @@
 				</field>
 			</form>
 		</field>
+		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_after_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Php_controller Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_controller"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
 		<!-- Php_document Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -2229,12 +2260,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_controller Field. Type: Editor. (joomla) -->
+		<!-- Php_model Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_controller"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
+			name="php_model"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -2341,12 +2372,12 @@
 			<option value="gb18030">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINA_NATIONAL_STANDARD_GBEIGHTEEN_THOUSAND_AND_THIRTY_MOST_SUITABLE_COLLATION_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINESE_CI</option>
 		</field>
-		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_model"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+			name="php_controller_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -2380,16 +2411,16 @@
 			<option value="COMPRESSED">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_COMPRESSED</option>
 		</field>
-		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
+		<!-- Php_model_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_controller_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
+			name="php_model_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
-			cols="15"
-			rows="30"
+			cols="30"
+			rows="15"
 			buttons="no"
 			syntax="php"
 			editor="codemirror|none"
@@ -2411,36 +2442,6 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP</option>
 		</field>
-		<!-- Php_model_list Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_model_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="30"
-			rows="15"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
-		<!-- Sql Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
-			required="true"
-		/>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -2455,8 +2456,19 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
+		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
+			required="true"
+		/>
 		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -2474,19 +2486,8 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_display"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
-			required="true"
-		/>
+		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -2627,17 +2628,17 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_import Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
+			name="php_import_display"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
 			required="true"
 		/>
 		<!-- Add_php_getitem Field. Type: Radio. (joomla) -->
@@ -2654,17 +2655,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
+		<!-- Php_import Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_setdata"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
+			name="php_import"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
 			required="true"
 		/>
 		<!-- Php_getitem Field. Type: Editor. (joomla) -->
@@ -2684,17 +2685,17 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_ext"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			name="php_import_setdata"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
 			required="true"
 		/>
 		<!-- Add_php_getitems Field. Type: Radio. (joomla) -->
@@ -2711,6 +2712,36 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
+		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_ext"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			required="true"
+		/>
+		<!-- Php_getitems Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_getitems"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->
diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js
index 9f7e4b7ec..74509a281 100644
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyhvyc_required = false;
 jform_vvvvvyivyd_required = false;
 jform_vvvvvyjvye_required = false;
 jform_vvvvvykvyf_required = false;
@@ -17,294 +16,295 @@ jform_vvvvvylvyg_required = false;
 jform_vvvvvymvyh_required = false;
 jform_vvvvvynvyi_required = false;
 jform_vvvvvyovyj_required = false;
-jform_vvvvvyovyk_required = false;
+jform_vvvvvypvyk_required = false;
 jform_vvvvvypvyl_required = false;
 jform_vvvvvyqvym_required = false;
+jform_vvvvvyrvyn_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyh = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyh(add_php_view_vvvvvyh);
+	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyi(add_php_view_vvvvvyi);
 
-	var add_php_jview_display_vvvvvyi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyi(add_php_jview_display_vvvvvyi);
+	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyj(add_php_jview_display_vvvvvyj);
 
-	var add_php_jview_vvvvvyj = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_vvvvvyj);
+	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyk(add_php_jview_vvvvvyk);
 
-	var add_php_document_vvvvvyk = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyk(add_php_document_vvvvvyk);
+	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyl(add_php_document_vvvvvyl);
 
-	var add_css_document_vvvvvyl = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyl(add_css_document_vvvvvyl);
+	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvym(add_css_document_vvvvvym);
 
-	var add_javascript_file_vvvvvym = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvym(add_javascript_file_vvvvvym);
+	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyn(add_javascript_file_vvvvvyn);
 
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyo(add_js_document_vvvvvyo);
 
-	var add_custom_button_vvvvvyo = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyo(add_custom_button_vvvvvyo);
+	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyp(add_custom_button_vvvvvyp);
 
-	var add_css_vvvvvyp = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyp(add_css_vvvvvyp);
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyq(add_css_vvvvvyq);
 
-	var add_php_ajax_vvvvvyq = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyq(add_php_ajax_vvvvvyq);
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyr(add_php_ajax_vvvvvyr);
 });
 
-// the vvvvvyh function
-function vvvvvyh(add_php_view_vvvvvyh)
+// the vvvvvyi function
+function vvvvvyi(add_php_view_vvvvvyi)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyh == 1)
+	if (add_php_view_vvvvvyi == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvyhvyc_required)
+		if (jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyhvyc_required = false;
+			jform_vvvvvyivyd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvyhvyc_required)
+		if (!jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyhvyc_required = true;
-		}
-	}
-}
-
-// the vvvvvyi function
-function vvvvvyi(add_php_jview_display_vvvvvyi)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyi == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvyivyd_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyivyd_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvyivyd_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyivyd_required = true;
 		}
 	}
 }
 
 // the vvvvvyj function
-function vvvvvyj(add_php_jview_vvvvvyj)
+function vvvvvyj(add_php_jview_display_vvvvvyj)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyj == 1)
+	if (add_php_jview_display_vvvvvyj == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
+		// add required attribute to php_jview_display field
 		if (jform_vvvvvyjvye_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyjvye_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview_display field
 		if (!jform_vvvvvyjvye_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyjvye_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_php_document_vvvvvyk)
+function vvvvvyk(add_php_jview_vvvvvyk)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyk == 1)
+	if (add_php_jview_vvvvvyk == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		// add required attribute to php_jview field
 		if (jform_vvvvvykvyf_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvykvyf_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview field
 		if (!jform_vvvvvykvyf_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvykvyf_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_css_document_vvvvvyl)
+function vvvvvyl(add_php_document_vvvvvyl)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyl == 1)
+	if (add_php_document_vvvvvyl == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		// add required attribute to php_document field
 		if (jform_vvvvvylvyg_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvylvyg_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		// remove required attribute from php_document field
 		if (!jform_vvvvvylvyg_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvylvyg_required = true;
 		}
 	}
 }
 
 // the vvvvvym function
-function vvvvvym(add_javascript_file_vvvvvym)
+function vvvvvym(add_css_document_vvvvvym)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvym == 1)
+	if (add_css_document_vvvvvym == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		// add required attribute to css_document field
 		if (jform_vvvvvymvyh_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvymvyh_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		// remove required attribute from css_document field
 		if (!jform_vvvvvymvyh_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvymvyh_required = true;
 		}
 	}
 }
 
 // the vvvvvyn function
-function vvvvvyn(add_js_document_vvvvvyn)
+function vvvvvyn(add_javascript_file_vvvvvyn)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyn == 1)
+	if (add_javascript_file_vvvvvyn == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		// add required attribute to javascript_file field
 		if (jform_vvvvvynvyi_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvynvyi_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_file field
 		if (!jform_vvvvvynvyi_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvynvyi_required = true;
 		}
 	}
 }
 
 // the vvvvvyo function
-function vvvvvyo(add_custom_button_vvvvvyo)
+function vvvvvyo(add_js_document_vvvvvyo)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyo == 1)
+	if (add_js_document_vvvvvyo == 1)
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		// add required attribute to js_document field
+		if (jform_vvvvvyovyj_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvyovyj_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		// remove required attribute from js_document field
+		if (!jform_vvvvvyovyj_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvyovyj_required = true;
+		}
+	}
+}
+
+// the vvvvvyp function
+function vvvvvyp(add_custom_button_vvvvvyp)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyp == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvyovyj_required)
+		if (jform_vvvvvypvyk_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyovyj_required = false;
+			jform_vvvvvypvyk_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvyovyk_required)
+		if (jform_vvvvvypvyl_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyovyk_required = false;
+			jform_vvvvvypvyl_required = false;
 		}
 	}
 	else
@@ -312,75 +312,75 @@ function vvvvvyo(add_custom_button_vvvvvyo)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvyovyj_required)
+		if (!jform_vvvvvypvyk_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyovyj_required = true;
+			jform_vvvvvypvyk_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvyovyk_required)
+		if (!jform_vvvvvypvyl_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyovyk_required = true;
-		}
-	}
-}
-
-// the vvvvvyp function
-function vvvvvyp(add_css_vvvvvyp)
-{
-	// set the function logic
-	if (add_css_vvvvvyp == 1)
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
-		if (jform_vvvvvypvyl_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvypvyl_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
-		if (!jform_vvvvvypvyl_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvypvyl_required = true;
 		}
 	}
 }
 
 // the vvvvvyq function
-function vvvvvyq(add_php_ajax_vvvvvyq)
+function vvvvvyq(add_css_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyq == 1)
+	if (add_css_vvvvvyq == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		// add required attribute to css field
+		if (jform_vvvvvyqvym_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyqvym_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		// remove required attribute from css field
+		if (!jform_vvvvvyqvym_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyqvym_required = true;
+		}
+	}
+}
+
+// the vvvvvyr function
+function vvvvvyr(add_php_ajax_vvvvvyr)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyr == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
 		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvyqvym_required)
+		if (jform_vvvvvyrvyn_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyqvym_required = false;
+			jform_vvvvvyrvyn_required = false;
 		}
 	}
 	else
@@ -388,13 +388,13 @@ function vvvvvyq(add_php_ajax_vvvvvyq)
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
 		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvyqvym_required)
+		if (!jform_vvvvvyrvyn_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyqvym_required = true;
+			jform_vvvvvyrvyn_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index 7fb122223..fb8eb05a6 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -9,44 +9,44 @@
  */
 
 // Some Global Values
-jform_vvvvwafvzu_required = false;
 jform_vvvvwagvzv_required = false;
-jform_vvvvwagvzw_required = false;
-jform_vvvvwagvzx_required = false;
+jform_vvvvwahvzw_required = false;
+jform_vvvvwahvzx_required = false;
+jform_vvvvwahvzy_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaf(target_vvvvwaf);
-
 	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwag(target_vvvvwag);
 
 	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwah = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwah(target_vvvvwah,type_vvvvwah);
+	vvvvwah(target_vvvvwah);
 
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai,target_vvvvwai);
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai,type_vvvvwai);
+
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
 });
 
-// the vvvvwaf function
-function vvvvwaf(target_vvvvwaf)
+// the vvvvwag function
+function vvvvwag(target_vvvvwag)
 {
 	// set the function logic
-	if (target_vvvvwaf == 2)
+	if (target_vvvvwag == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
 		// add required attribute to function_name field
-		if (jform_vvvvwafvzu_required)
+		if (jform_vvvvwagvzv_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvwafvzu_required = false;
+			jform_vvvvwagvzv_required = false;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
@@ -55,102 +55,102 @@ function vvvvwaf(target_vvvvwaf)
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
 		// remove required attribute from function_name field
-		if (!jform_vvvvwafvzu_required)
+		if (!jform_vvvvwagvzv_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvwafvzu_required = true;
+			jform_vvvvwagvzv_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvwag function
-function vvvvwag(target_vvvvwag)
+// the vvvvwah function
+function vvvvwah(target_vvvvwah)
 {
 	// set the function logic
-	if (target_vvvvwag == 1)
+	if (target_vvvvwah == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
 		// add required attribute to component field
-		if (jform_vvvvwagvzv_required)
+		if (jform_vvvvwahvzw_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwagvzv_required = false;
+			jform_vvvvwahvzw_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwagvzw_required)
+		if (jform_vvvvwahvzx_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwagvzw_required = false;
+			jform_vvvvwahvzx_required = false;
 		}
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
 		// add required attribute to type field
-		if (jform_vvvvwagvzx_required)
+		if (jform_vvvvwahvzy_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwagvzx_required = false;
+			jform_vvvvwahvzy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
 		// remove required attribute from component field
-		if (!jform_vvvvwagvzv_required)
+		if (!jform_vvvvwahvzw_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwagvzv_required = true;
+			jform_vvvvwahvzw_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwagvzw_required)
+		if (!jform_vvvvwahvzx_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwagvzw_required = true;
+			jform_vvvvwahvzx_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
 		// remove required attribute from type field
-		if (!jform_vvvvwagvzx_required)
+		if (!jform_vvvvwahvzy_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwagvzx_required = true;
+			jform_vvvvwahvzy_required = true;
 		}
 	}
 }
 
-// the vvvvwah function
-function vvvvwah(target_vvvvwah,type_vvvvwah)
+// the vvvvwai function
+function vvvvwai(target_vvvvwai,type_vvvvwai)
 {
 	// set the function logic
-	if (target_vvvvwah == 1 && type_vvvvwah == 1)
+	if (target_vvvvwai == 1 && type_vvvvwai == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -162,11 +162,11 @@ function vvvvwah(target_vvvvwah,type_vvvvwah)
 	}
 }
 
-// the vvvvwai function
-function vvvvwai(type_vvvvwai,target_vvvvwai)
+// the vvvvwaj function
+function vvvvwaj(type_vvvvwaj,target_vvvvwaj)
 {
 	// set the function logic
-	if (type_vvvvwai == 1 && target_vvvvwai == 1)
+	if (type_vvvvwaj == 1 && target_vvvvwaj == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index 70cf89b22..1e2806e5c 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -9,35 +9,32 @@
  */
 
 // Some Global Values
-jform_vvvvvzevza_required = false;
-jform_vvvvvzgvzb_required = false;
+jform_vvvvvzfvzb_required = false;
 jform_vvvvvzhvzc_required = false;
 jform_vvvvvzivzd_required = false;
 jform_vvvvvzjvze_required = false;
 jform_vvvvvzkvzf_required = false;
-jform_vvvvvzpvzg_required = false;
-jform_vvvvvzrvzh_required = false;
+jform_vvvvvzlvzg_required = false;
+jform_vvvvvzqvzh_required = false;
 jform_vvvvvzsvzi_required = false;
-jform_vvvvvzuvzj_required = false;
-jform_vvvvvzuvzk_required = false;
+jform_vvvvvztvzj_required = false;
+jform_vvvvvzvvzk_required = false;
 jform_vvvvvzvvzl_required = false;
 jform_vvvvvzwvzm_required = false;
 jform_vvvvvzxvzn_required = false;
-jform_vvvvvzzvzo_required = false;
-jform_vvvvvzzvzp_required = false;
-jform_vvvvvzzvzq_required = false;
+jform_vvvvvzyvzo_required = false;
+jform_vvvvwaavzp_required = false;
+jform_vvvvwaavzq_required = false;
 jform_vvvvwaavzr_required = false;
 jform_vvvvwabvzs_required = false;
 jform_vvvvwacvzt_required = false;
+jform_vvvvwadvzu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
-	vvvvvze(gettype_vvvvvze);
-
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(gettype_vvvvvzf);
 
 	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
 	vvvvvzg(main_source_vvvvvzg);
@@ -51,48 +48,48 @@ jQuery(document).ready(function()
 	var main_source_vvvvvzj = jQuery("#jform_main_source").val();
 	vvvvvzj(main_source_vvvvvzj);
 
-	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzk(addcalculation_vvvvvzk);
+	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
+	vvvvvzk(main_source_vvvvvzk);
 
 	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(addcalculation_vvvvvzl);
 
 	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
 	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
 
-	var main_source_vvvvvzp = jQuery("#jform_main_source").val();
-	vvvvvzp(main_source_vvvvvzp);
+	var addcalculation_vvvvvzn = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn);
 
 	var main_source_vvvvvzq = jQuery("#jform_main_source").val();
 	vvvvvzq(main_source_vvvvvzq);
 
-	var add_php_before_getitem_vvvvvzr = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitem_vvvvvzr,gettype_vvvvvzr);
+	var main_source_vvvvvzr = jQuery("#jform_main_source").val();
+	vvvvvzr(main_source_vvvvvzr);
 
-	var add_php_after_getitem_vvvvvzs = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
 
-	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(gettype_vvvvvzu);
+	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
 
-	var add_php_getlistquery_vvvvvzv = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv);
+	vvvvvzv(gettype_vvvvvzv);
 
-	var add_php_before_getitems_vvvvvzw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
 
-	var add_php_after_getitems_vvvvvzx = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
 
-	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	vvvvvzz(gettype_vvvvvzz);
+	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
 
 	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
 	vvvvwaa(gettype_vvvvwaa);
@@ -101,27 +98,30 @@ jQuery(document).ready(function()
 	vvvvwab(gettype_vvvvwab);
 
 	var gettype_vvvvwac = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwac = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac);
+	vvvvwac(gettype_vvvvwac);
 
-	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	vvvvwae(gettype_vvvvwae);
+	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+
+	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
+	vvvvwaf(gettype_vvvvwaf);
 });
 
-// the vvvvvze function
-function vvvvvze(gettype_vvvvvze)
+// the vvvvvzf function
+function vvvvvzf(gettype_vvvvvzf)
 {
-	if (isSet(gettype_vvvvvze) && gettype_vvvvvze.constructor !== Array)
+	if (isSet(gettype_vvvvvzf) && gettype_vvvvvzf.constructor !== Array)
 	{
-		var temp_vvvvvze = gettype_vvvvvze;
-		var gettype_vvvvvze = [];
-		gettype_vvvvvze.push(temp_vvvvvze);
+		var temp_vvvvvzf = gettype_vvvvvzf;
+		var gettype_vvvvvzf = [];
+		gettype_vvvvvzf.push(temp_vvvvvzf);
 	}
-	else if (!isSet(gettype_vvvvvze))
+	else if (!isSet(gettype_vvvvvzf))
 	{
-		var gettype_vvvvvze = [];
+		var gettype_vvvvvzf = [];
 	}
-	var gettype = gettype_vvvvvze.some(gettype_vvvvvze_SomeFunc);
+	var gettype = gettype_vvvvvzf.some(gettype_vvvvvzf_SomeFunc);
 
 
 	// set this function logic
@@ -129,73 +129,35 @@ function vvvvvze(gettype_vvvvvze)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
 		// add required attribute to getcustom field
-		if (jform_vvvvvzevza_required)
+		if (jform_vvvvvzfvzb_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvzevza_required = false;
+			jform_vvvvvzfvzb_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
 		// remove required attribute from getcustom field
-		if (!jform_vvvvvzevza_required)
+		if (!jform_vvvvvzfvzb_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvzevza_required = true;
+			jform_vvvvvzfvzb_required = true;
 		}
 	}
 }
 
-// the vvvvvze Some function
-function gettype_vvvvvze_SomeFunc(gettype_vvvvvze)
-{
-	// set the function logic
-	if (gettype_vvvvvze == 3 || gettype_vvvvvze == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzf function
-function vvvvvzf(main_source_vvvvvzf)
-{
-	if (isSet(main_source_vvvvvzf) && main_source_vvvvvzf.constructor !== Array)
-	{
-		var temp_vvvvvzf = main_source_vvvvvzf;
-		var main_source_vvvvvzf = [];
-		main_source_vvvvvzf.push(temp_vvvvvzf);
-	}
-	else if (!isSet(main_source_vvvvvzf))
-	{
-		var main_source_vvvvvzf = [];
-	}
-	var main_source = main_source_vvvvvzf.some(main_source_vvvvvzf_SomeFunc);
-
-
-	// set this function logic
-	if (main_source)
-	{
-		jQuery('#jform_select_all').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_select_all').closest('.control-group').hide();
-	}
-}
-
 // the vvvvvzf Some function
-function main_source_vvvvvzf_SomeFunc(main_source_vvvvvzf)
+function gettype_vvvvvzf_SomeFunc(gettype_vvvvvzf)
 {
 	// set the function logic
-	if (main_source_vvvvvzf == 1 || main_source_vvvvvzf == 2)
+	if (gettype_vvvvvzf == 3 || gettype_vvvvvzf == 4)
 	{
 		return true;
 	}
@@ -221,29 +183,11 @@ function vvvvvzg(main_source_vvvvvzg)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_view_table_main').closest('.control-group').show();
-		// add required attribute to view_table_main field
-		if (jform_vvvvvzgvzb_required)
-		{
-			updateFieldRequired('view_table_main',0);
-			jQuery('#jform_view_table_main').prop('required','required');
-			jQuery('#jform_view_table_main').attr('aria-required',true);
-			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvzgvzb_required = false;
-		}
+		jQuery('#jform_select_all').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_view_table_main').closest('.control-group').hide();
-		// remove required attribute from view_table_main field
-		if (!jform_vvvvvzgvzb_required)
-		{
-			updateFieldRequired('view_table_main',1);
-			jQuery('#jform_view_table_main').removeAttr('required');
-			jQuery('#jform_view_table_main').removeAttr('aria-required');
-			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvzgvzb_required = true;
-		}
+		jQuery('#jform_select_all').closest('.control-group').hide();
 	}
 }
 
@@ -251,7 +195,7 @@ function vvvvvzg(main_source_vvvvvzg)
 function main_source_vvvvvzg_SomeFunc(main_source_vvvvvzg)
 {
 	// set the function logic
-	if (main_source_vvvvvzg == 1)
+	if (main_source_vvvvvzg == 1 || main_source_vvvvvzg == 2)
 	{
 		return true;
 	}
@@ -277,27 +221,27 @@ function vvvvvzh(main_source_vvvvvzh)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_view_selection').closest('.control-group').show();
-		// add required attribute to view_selection field
+		jQuery('#jform_view_table_main').closest('.control-group').show();
+		// add required attribute to view_table_main field
 		if (jform_vvvvvzhvzc_required)
 		{
-			updateFieldRequired('view_selection',0);
-			jQuery('#jform_view_selection').prop('required','required');
-			jQuery('#jform_view_selection').attr('aria-required',true);
-			jQuery('#jform_view_selection').addClass('required');
+			updateFieldRequired('view_table_main',0);
+			jQuery('#jform_view_table_main').prop('required','required');
+			jQuery('#jform_view_table_main').attr('aria-required',true);
+			jQuery('#jform_view_table_main').addClass('required');
 			jform_vvvvvzhvzc_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_view_selection').closest('.control-group').hide();
-		// remove required attribute from view_selection field
+		jQuery('#jform_view_table_main').closest('.control-group').hide();
+		// remove required attribute from view_table_main field
 		if (!jform_vvvvvzhvzc_required)
 		{
-			updateFieldRequired('view_selection',1);
-			jQuery('#jform_view_selection').removeAttr('required');
-			jQuery('#jform_view_selection').removeAttr('aria-required');
-			jQuery('#jform_view_selection').removeClass('required');
+			updateFieldRequired('view_table_main',1);
+			jQuery('#jform_view_table_main').removeAttr('required');
+			jQuery('#jform_view_table_main').removeAttr('aria-required');
+			jQuery('#jform_view_table_main').removeClass('required');
 			jform_vvvvvzhvzc_required = true;
 		}
 	}
@@ -333,27 +277,27 @@ function vvvvvzi(main_source_vvvvvzi)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_db_table_main').closest('.control-group').show();
-		// add required attribute to db_table_main field
+		jQuery('#jform_view_selection').closest('.control-group').show();
+		// add required attribute to view_selection field
 		if (jform_vvvvvzivzd_required)
 		{
-			updateFieldRequired('db_table_main',0);
-			jQuery('#jform_db_table_main').prop('required','required');
-			jQuery('#jform_db_table_main').attr('aria-required',true);
-			jQuery('#jform_db_table_main').addClass('required');
+			updateFieldRequired('view_selection',0);
+			jQuery('#jform_view_selection').prop('required','required');
+			jQuery('#jform_view_selection').attr('aria-required',true);
+			jQuery('#jform_view_selection').addClass('required');
 			jform_vvvvvzivzd_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_db_table_main').closest('.control-group').hide();
-		// remove required attribute from db_table_main field
+		jQuery('#jform_view_selection').closest('.control-group').hide();
+		// remove required attribute from view_selection field
 		if (!jform_vvvvvzivzd_required)
 		{
-			updateFieldRequired('db_table_main',1);
-			jQuery('#jform_db_table_main').removeAttr('required');
-			jQuery('#jform_db_table_main').removeAttr('aria-required');
-			jQuery('#jform_db_table_main').removeClass('required');
+			updateFieldRequired('view_selection',1);
+			jQuery('#jform_view_selection').removeAttr('required');
+			jQuery('#jform_view_selection').removeAttr('aria-required');
+			jQuery('#jform_view_selection').removeClass('required');
 			jform_vvvvvzivzd_required = true;
 		}
 	}
@@ -363,7 +307,7 @@ function vvvvvzi(main_source_vvvvvzi)
 function main_source_vvvvvzi_SomeFunc(main_source_vvvvvzi)
 {
 	// set the function logic
-	if (main_source_vvvvvzi == 2)
+	if (main_source_vvvvvzi == 1)
 	{
 		return true;
 	}
@@ -389,27 +333,27 @@ function vvvvvzj(main_source_vvvvvzj)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_db_selection').closest('.control-group').show();
-		// add required attribute to db_selection field
+		jQuery('#jform_db_table_main').closest('.control-group').show();
+		// add required attribute to db_table_main field
 		if (jform_vvvvvzjvze_required)
 		{
-			updateFieldRequired('db_selection',0);
-			jQuery('#jform_db_selection').prop('required','required');
-			jQuery('#jform_db_selection').attr('aria-required',true);
-			jQuery('#jform_db_selection').addClass('required');
+			updateFieldRequired('db_table_main',0);
+			jQuery('#jform_db_table_main').prop('required','required');
+			jQuery('#jform_db_table_main').attr('aria-required',true);
+			jQuery('#jform_db_table_main').addClass('required');
 			jform_vvvvvzjvze_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_db_selection').closest('.control-group').hide();
-		// remove required attribute from db_selection field
+		jQuery('#jform_db_table_main').closest('.control-group').hide();
+		// remove required attribute from db_table_main field
 		if (!jform_vvvvvzjvze_required)
 		{
-			updateFieldRequired('db_selection',1);
-			jQuery('#jform_db_selection').removeAttr('required');
-			jQuery('#jform_db_selection').removeAttr('aria-required');
-			jQuery('#jform_db_selection').removeClass('required');
+			updateFieldRequired('db_table_main',1);
+			jQuery('#jform_db_table_main').removeAttr('required');
+			jQuery('#jform_db_table_main').removeAttr('aria-required');
+			jQuery('#jform_db_table_main').removeClass('required');
 			jform_vvvvvzjvze_required = true;
 		}
 	}
@@ -427,98 +371,93 @@ function main_source_vvvvvzj_SomeFunc(main_source_vvvvvzj)
 }
 
 // the vvvvvzk function
-function vvvvvzk(addcalculation_vvvvvzk)
+function vvvvvzk(main_source_vvvvvzk)
+{
+	if (isSet(main_source_vvvvvzk) && main_source_vvvvvzk.constructor !== Array)
+	{
+		var temp_vvvvvzk = main_source_vvvvvzk;
+		var main_source_vvvvvzk = [];
+		main_source_vvvvvzk.push(temp_vvvvvzk);
+	}
+	else if (!isSet(main_source_vvvvvzk))
+	{
+		var main_source_vvvvvzk = [];
+	}
+	var main_source = main_source_vvvvvzk.some(main_source_vvvvvzk_SomeFunc);
+
+
+	// set this function logic
+	if (main_source)
+	{
+		jQuery('#jform_db_selection').closest('.control-group').show();
+		// add required attribute to db_selection field
+		if (jform_vvvvvzkvzf_required)
+		{
+			updateFieldRequired('db_selection',0);
+			jQuery('#jform_db_selection').prop('required','required');
+			jQuery('#jform_db_selection').attr('aria-required',true);
+			jQuery('#jform_db_selection').addClass('required');
+			jform_vvvvvzkvzf_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_db_selection').closest('.control-group').hide();
+		// remove required attribute from db_selection field
+		if (!jform_vvvvvzkvzf_required)
+		{
+			updateFieldRequired('db_selection',1);
+			jQuery('#jform_db_selection').removeAttr('required');
+			jQuery('#jform_db_selection').removeAttr('aria-required');
+			jQuery('#jform_db_selection').removeClass('required');
+			jform_vvvvvzkvzf_required = true;
+		}
+	}
+}
+
+// the vvvvvzk Some function
+function main_source_vvvvvzk_SomeFunc(main_source_vvvvvzk)
 {
 	// set the function logic
-	if (addcalculation_vvvvvzk == 1)
+	if (main_source_vvvvvzk == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzl function
+function vvvvvzl(addcalculation_vvvvvzl)
+{
+	// set the function logic
+	if (addcalculation_vvvvvzl == 1)
 	{
 		jQuery('#jform_php_calculation-lbl').closest('.control-group').show();
 		// add required attribute to php_calculation field
-		if (jform_vvvvvzkvzf_required)
+		if (jform_vvvvvzlvzg_required)
 		{
 			updateFieldRequired('php_calculation',0);
 			jQuery('#jform_php_calculation').prop('required','required');
 			jQuery('#jform_php_calculation').attr('aria-required',true);
 			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvzkvzf_required = false;
+			jform_vvvvvzlvzg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_calculation-lbl').closest('.control-group').hide();
 		// remove required attribute from php_calculation field
-		if (!jform_vvvvvzkvzf_required)
+		if (!jform_vvvvvzlvzg_required)
 		{
 			updateFieldRequired('php_calculation',1);
 			jQuery('#jform_php_calculation').removeAttr('required');
 			jQuery('#jform_php_calculation').removeAttr('aria-required');
 			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvzkvzf_required = true;
+			jform_vvvvvzlvzg_required = true;
 		}
 	}
 }
 
-// the vvvvvzl function
-function vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl)
-{
-	if (isSet(addcalculation_vvvvvzl) && addcalculation_vvvvvzl.constructor !== Array)
-	{
-		var temp_vvvvvzl = addcalculation_vvvvvzl;
-		var addcalculation_vvvvvzl = [];
-		addcalculation_vvvvvzl.push(temp_vvvvvzl);
-	}
-	else if (!isSet(addcalculation_vvvvvzl))
-	{
-		var addcalculation_vvvvvzl = [];
-	}
-	var addcalculation = addcalculation_vvvvvzl.some(addcalculation_vvvvvzl_SomeFunc);
-
-	if (isSet(gettype_vvvvvzl) && gettype_vvvvvzl.constructor !== Array)
-	{
-		var temp_vvvvvzl = gettype_vvvvvzl;
-		var gettype_vvvvvzl = [];
-		gettype_vvvvvzl.push(temp_vvvvvzl);
-	}
-	else if (!isSet(gettype_vvvvvzl))
-	{
-		var gettype_vvvvvzl = [];
-	}
-	var gettype = gettype_vvvvvzl.some(gettype_vvvvvzl_SomeFunc);
-
-
-	// set this function logic
-	if (addcalculation && gettype)
-	{
-		jQuery('.note_calculation_item').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_calculation_item').closest('.control-group').hide();
-	}
-}
-
-// the vvvvvzl Some function
-function addcalculation_vvvvvzl_SomeFunc(addcalculation_vvvvvzl)
-{
-	// set the function logic
-	if (addcalculation_vvvvvzl == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzl Some function
-function gettype_vvvvvzl_SomeFunc(gettype_vvvvvzl)
-{
-	// set the function logic
-	if (gettype_vvvvvzl == 1 || gettype_vvvvvzl == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzm function
 function vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm)
 {
@@ -550,11 +489,11 @@ function vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm)
 	// set this function logic
 	if (addcalculation && gettype)
 	{
-		jQuery('.note_calculation_items').closest('.control-group').show();
+		jQuery('.note_calculation_item').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_calculation_items').closest('.control-group').hide();
+		jQuery('.note_calculation_item').closest('.control-group').hide();
 	}
 }
 
@@ -573,63 +512,68 @@ function addcalculation_vvvvvzm_SomeFunc(addcalculation_vvvvvzm)
 function gettype_vvvvvzm_SomeFunc(gettype_vvvvvzm)
 {
 	// set the function logic
-	if (gettype_vvvvvzm == 2 || gettype_vvvvvzm == 4)
+	if (gettype_vvvvvzm == 1 || gettype_vvvvvzm == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvvzp function
-function vvvvvzp(main_source_vvvvvzp)
+// the vvvvvzn function
+function vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn)
 {
-	if (isSet(main_source_vvvvvzp) && main_source_vvvvvzp.constructor !== Array)
+	if (isSet(addcalculation_vvvvvzn) && addcalculation_vvvvvzn.constructor !== Array)
 	{
-		var temp_vvvvvzp = main_source_vvvvvzp;
-		var main_source_vvvvvzp = [];
-		main_source_vvvvvzp.push(temp_vvvvvzp);
+		var temp_vvvvvzn = addcalculation_vvvvvzn;
+		var addcalculation_vvvvvzn = [];
+		addcalculation_vvvvvzn.push(temp_vvvvvzn);
 	}
-	else if (!isSet(main_source_vvvvvzp))
+	else if (!isSet(addcalculation_vvvvvzn))
 	{
-		var main_source_vvvvvzp = [];
+		var addcalculation_vvvvvzn = [];
 	}
-	var main_source = main_source_vvvvvzp.some(main_source_vvvvvzp_SomeFunc);
+	var addcalculation = addcalculation_vvvvvzn.some(addcalculation_vvvvvzn_SomeFunc);
+
+	if (isSet(gettype_vvvvvzn) && gettype_vvvvvzn.constructor !== Array)
+	{
+		var temp_vvvvvzn = gettype_vvvvvzn;
+		var gettype_vvvvvzn = [];
+		gettype_vvvvvzn.push(temp_vvvvvzn);
+	}
+	else if (!isSet(gettype_vvvvvzn))
+	{
+		var gettype_vvvvvzn = [];
+	}
+	var gettype = gettype_vvvvvzn.some(gettype_vvvvvzn_SomeFunc);
 
 
 	// set this function logic
-	if (main_source)
+	if (addcalculation && gettype)
 	{
-		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
-		// add required attribute to php_custom_get field
-		if (jform_vvvvvzpvzg_required)
-		{
-			updateFieldRequired('php_custom_get',0);
-			jQuery('#jform_php_custom_get').prop('required','required');
-			jQuery('#jform_php_custom_get').attr('aria-required',true);
-			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzpvzg_required = false;
-		}
+		jQuery('.note_calculation_items').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
-		// remove required attribute from php_custom_get field
-		if (!jform_vvvvvzpvzg_required)
-		{
-			updateFieldRequired('php_custom_get',1);
-			jQuery('#jform_php_custom_get').removeAttr('required');
-			jQuery('#jform_php_custom_get').removeAttr('aria-required');
-			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzpvzg_required = true;
-		}
+		jQuery('.note_calculation_items').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzp Some function
-function main_source_vvvvvzp_SomeFunc(main_source_vvvvvzp)
+// the vvvvvzn Some function
+function addcalculation_vvvvvzn_SomeFunc(addcalculation_vvvvvzn)
 {
 	// set the function logic
-	if (main_source_vvvvvzp == 3)
+	if (addcalculation_vvvvvzn == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzn Some function
+function gettype_vvvvvzn_SomeFunc(gettype_vvvvvzn)
+{
+	// set the function logic
+	if (gettype_vvvvvzn == 2 || gettype_vvvvvzn == 4)
 	{
 		return true;
 	}
@@ -652,6 +596,62 @@ function vvvvvzq(main_source_vvvvvzq)
 	var main_source = main_source_vvvvvzq.some(main_source_vvvvvzq_SomeFunc);
 
 
+	// set this function logic
+	if (main_source)
+	{
+		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
+		// add required attribute to php_custom_get field
+		if (jform_vvvvvzqvzh_required)
+		{
+			updateFieldRequired('php_custom_get',0);
+			jQuery('#jform_php_custom_get').prop('required','required');
+			jQuery('#jform_php_custom_get').attr('aria-required',true);
+			jQuery('#jform_php_custom_get').addClass('required');
+			jform_vvvvvzqvzh_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
+		// remove required attribute from php_custom_get field
+		if (!jform_vvvvvzqvzh_required)
+		{
+			updateFieldRequired('php_custom_get',1);
+			jQuery('#jform_php_custom_get').removeAttr('required');
+			jQuery('#jform_php_custom_get').removeAttr('aria-required');
+			jQuery('#jform_php_custom_get').removeClass('required');
+			jform_vvvvvzqvzh_required = true;
+		}
+	}
+}
+
+// the vvvvvzq Some function
+function main_source_vvvvvzq_SomeFunc(main_source_vvvvvzq)
+{
+	// set the function logic
+	if (main_source_vvvvvzq == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzr function
+function vvvvvzr(main_source_vvvvvzr)
+{
+	if (isSet(main_source_vvvvvzr) && main_source_vvvvvzr.constructor !== Array)
+	{
+		var temp_vvvvvzr = main_source_vvvvvzr;
+		var main_source_vvvvvzr = [];
+		main_source_vvvvvzr.push(temp_vvvvvzr);
+	}
+	else if (!isSet(main_source_vvvvvzr))
+	{
+		var main_source_vvvvvzr = [];
+	}
+	var main_source = main_source_vvvvvzr.some(main_source_vvvvvzr_SomeFunc);
+
+
 	// set this function logic
 	if (main_source)
 	{
@@ -675,90 +675,11 @@ function vvvvvzq(main_source_vvvvvzq)
 	}
 }
 
-// the vvvvvzq Some function
-function main_source_vvvvvzq_SomeFunc(main_source_vvvvvzq)
-{
-	// set the function logic
-	if (main_source_vvvvvzq == 1 || main_source_vvvvvzq == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzr function
-function vvvvvzr(add_php_before_getitem_vvvvvzr,gettype_vvvvvzr)
-{
-	if (isSet(add_php_before_getitem_vvvvvzr) && add_php_before_getitem_vvvvvzr.constructor !== Array)
-	{
-		var temp_vvvvvzr = add_php_before_getitem_vvvvvzr;
-		var add_php_before_getitem_vvvvvzr = [];
-		add_php_before_getitem_vvvvvzr.push(temp_vvvvvzr);
-	}
-	else if (!isSet(add_php_before_getitem_vvvvvzr))
-	{
-		var add_php_before_getitem_vvvvvzr = [];
-	}
-	var add_php_before_getitem = add_php_before_getitem_vvvvvzr.some(add_php_before_getitem_vvvvvzr_SomeFunc);
-
-	if (isSet(gettype_vvvvvzr) && gettype_vvvvvzr.constructor !== Array)
-	{
-		var temp_vvvvvzr = gettype_vvvvvzr;
-		var gettype_vvvvvzr = [];
-		gettype_vvvvvzr.push(temp_vvvvvzr);
-	}
-	else if (!isSet(gettype_vvvvvzr))
-	{
-		var gettype_vvvvvzr = [];
-	}
-	var gettype = gettype_vvvvvzr.some(gettype_vvvvvzr_SomeFunc);
-
-
-	// set this function logic
-	if (add_php_before_getitem && gettype)
-	{
-		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
-		// add required attribute to php_before_getitem field
-		if (jform_vvvvvzrvzh_required)
-		{
-			updateFieldRequired('php_before_getitem',0);
-			jQuery('#jform_php_before_getitem').prop('required','required');
-			jQuery('#jform_php_before_getitem').attr('aria-required',true);
-			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzrvzh_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_getitem field
-		if (!jform_vvvvvzrvzh_required)
-		{
-			updateFieldRequired('php_before_getitem',1);
-			jQuery('#jform_php_before_getitem').removeAttr('required');
-			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzrvzh_required = true;
-		}
-	}
-}
-
 // the vvvvvzr Some function
-function add_php_before_getitem_vvvvvzr_SomeFunc(add_php_before_getitem_vvvvvzr)
+function main_source_vvvvvzr_SomeFunc(main_source_vvvvvzr)
 {
 	// set the function logic
-	if (add_php_before_getitem_vvvvvzr == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzr Some function
-function gettype_vvvvvzr_SomeFunc(gettype_vvvvvzr)
-{
-	// set the function logic
-	if (gettype_vvvvvzr == 1 || gettype_vvvvvzr == 3)
+	if (main_source_vvvvvzr == 1 || main_source_vvvvvzr == 2)
 	{
 		return true;
 	}
@@ -766,19 +687,19 @@ function gettype_vvvvvzr_SomeFunc(gettype_vvvvvzr)
 }
 
 // the vvvvvzs function
-function vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs)
+function vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs)
 {
-	if (isSet(add_php_after_getitem_vvvvvzs) && add_php_after_getitem_vvvvvzs.constructor !== Array)
+	if (isSet(add_php_before_getitem_vvvvvzs) && add_php_before_getitem_vvvvvzs.constructor !== Array)
 	{
-		var temp_vvvvvzs = add_php_after_getitem_vvvvvzs;
-		var add_php_after_getitem_vvvvvzs = [];
-		add_php_after_getitem_vvvvvzs.push(temp_vvvvvzs);
+		var temp_vvvvvzs = add_php_before_getitem_vvvvvzs;
+		var add_php_before_getitem_vvvvvzs = [];
+		add_php_before_getitem_vvvvvzs.push(temp_vvvvvzs);
 	}
-	else if (!isSet(add_php_after_getitem_vvvvvzs))
+	else if (!isSet(add_php_before_getitem_vvvvvzs))
 	{
-		var add_php_after_getitem_vvvvvzs = [];
+		var add_php_before_getitem_vvvvvzs = [];
 	}
-	var add_php_after_getitem = add_php_after_getitem_vvvvvzs.some(add_php_after_getitem_vvvvvzs_SomeFunc);
+	var add_php_before_getitem = add_php_before_getitem_vvvvvzs.some(add_php_before_getitem_vvvvvzs_SomeFunc);
 
 	if (isSet(gettype_vvvvvzs) && gettype_vvvvvzs.constructor !== Array)
 	{
@@ -794,39 +715,39 @@ function vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs)
 
 
 	// set this function logic
-	if (add_php_after_getitem && gettype)
+	if (add_php_before_getitem && gettype)
 	{
-		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
-		// add required attribute to php_after_getitem field
+		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
+		// add required attribute to php_before_getitem field
 		if (jform_vvvvvzsvzi_required)
 		{
-			updateFieldRequired('php_after_getitem',0);
-			jQuery('#jform_php_after_getitem').prop('required','required');
-			jQuery('#jform_php_after_getitem').attr('aria-required',true);
-			jQuery('#jform_php_after_getitem').addClass('required');
+			updateFieldRequired('php_before_getitem',0);
+			jQuery('#jform_php_before_getitem').prop('required','required');
+			jQuery('#jform_php_before_getitem').attr('aria-required',true);
+			jQuery('#jform_php_before_getitem').addClass('required');
 			jform_vvvvvzsvzi_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_getitem field
+		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_getitem field
 		if (!jform_vvvvvzsvzi_required)
 		{
-			updateFieldRequired('php_after_getitem',1);
-			jQuery('#jform_php_after_getitem').removeAttr('required');
-			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitem').removeClass('required');
+			updateFieldRequired('php_before_getitem',1);
+			jQuery('#jform_php_before_getitem').removeAttr('required');
+			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
+			jQuery('#jform_php_before_getitem').removeClass('required');
 			jform_vvvvvzsvzi_required = true;
 		}
 	}
 }
 
 // the vvvvvzs Some function
-function add_php_after_getitem_vvvvvzs_SomeFunc(add_php_after_getitem_vvvvvzs)
+function add_php_before_getitem_vvvvvzs_SomeFunc(add_php_before_getitem_vvvvvzs)
 {
 	// set the function logic
-	if (add_php_after_getitem_vvvvvzs == 1)
+	if (add_php_before_getitem_vvvvvzs == 1)
 	{
 		return true;
 	}
@@ -844,76 +765,79 @@ function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs)
 	return false;
 }
 
-// the vvvvvzu function
-function vvvvvzu(gettype_vvvvvzu)
+// the vvvvvzt function
+function vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt)
 {
-	if (isSet(gettype_vvvvvzu) && gettype_vvvvvzu.constructor !== Array)
+	if (isSet(add_php_after_getitem_vvvvvzt) && add_php_after_getitem_vvvvvzt.constructor !== Array)
 	{
-		var temp_vvvvvzu = gettype_vvvvvzu;
-		var gettype_vvvvvzu = [];
-		gettype_vvvvvzu.push(temp_vvvvvzu);
+		var temp_vvvvvzt = add_php_after_getitem_vvvvvzt;
+		var add_php_after_getitem_vvvvvzt = [];
+		add_php_after_getitem_vvvvvzt.push(temp_vvvvvzt);
 	}
-	else if (!isSet(gettype_vvvvvzu))
+	else if (!isSet(add_php_after_getitem_vvvvvzt))
 	{
-		var gettype_vvvvvzu = [];
+		var add_php_after_getitem_vvvvvzt = [];
 	}
-	var gettype = gettype_vvvvvzu.some(gettype_vvvvvzu_SomeFunc);
+	var add_php_after_getitem = add_php_after_getitem_vvvvvzt.some(add_php_after_getitem_vvvvvzt_SomeFunc);
+
+	if (isSet(gettype_vvvvvzt) && gettype_vvvvvzt.constructor !== Array)
+	{
+		var temp_vvvvvzt = gettype_vvvvvzt;
+		var gettype_vvvvvzt = [];
+		gettype_vvvvvzt.push(temp_vvvvvzt);
+	}
+	else if (!isSet(gettype_vvvvvzt))
+	{
+		var gettype_vvvvvzt = [];
+	}
+	var gettype = gettype_vvvvvzt.some(gettype_vvvvvzt_SomeFunc);
 
 
 	// set this function logic
-	if (gettype)
+	if (add_php_after_getitem && gettype)
 	{
-		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		// add required attribute to add_php_after_getitem field
-		if (jform_vvvvvzuvzj_required)
+		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
+		// add required attribute to php_after_getitem field
+		if (jform_vvvvvztvzj_required)
 		{
-			updateFieldRequired('add_php_after_getitem',0);
-			jQuery('#jform_add_php_after_getitem').prop('required','required');
-			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
-			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvzuvzj_required = false;
-		}
-		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		// add required attribute to add_php_before_getitem field
-		if (jform_vvvvvzuvzk_required)
-		{
-			updateFieldRequired('add_php_before_getitem',0);
-			jQuery('#jform_add_php_before_getitem').prop('required','required');
-			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
-			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvzuvzk_required = false;
+			updateFieldRequired('php_after_getitem',0);
+			jQuery('#jform_php_after_getitem').prop('required','required');
+			jQuery('#jform_php_after_getitem').attr('aria-required',true);
+			jQuery('#jform_php_after_getitem').addClass('required');
+			jform_vvvvvztvzj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		// remove required attribute from add_php_after_getitem field
-		if (!jform_vvvvvzuvzj_required)
+		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_getitem field
+		if (!jform_vvvvvztvzj_required)
 		{
-			updateFieldRequired('add_php_after_getitem',1);
-			jQuery('#jform_add_php_after_getitem').removeAttr('required');
-			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
-			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvzuvzj_required = true;
-		}
-		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		// remove required attribute from add_php_before_getitem field
-		if (!jform_vvvvvzuvzk_required)
-		{
-			updateFieldRequired('add_php_before_getitem',1);
-			jQuery('#jform_add_php_before_getitem').removeAttr('required');
-			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
-			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvzuvzk_required = true;
+			updateFieldRequired('php_after_getitem',1);
+			jQuery('#jform_php_after_getitem').removeAttr('required');
+			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
+			jQuery('#jform_php_after_getitem').removeClass('required');
+			jform_vvvvvztvzj_required = true;
 		}
 	}
 }
 
-// the vvvvvzu Some function
-function gettype_vvvvvzu_SomeFunc(gettype_vvvvvzu)
+// the vvvvvzt Some function
+function add_php_after_getitem_vvvvvzt_SomeFunc(add_php_after_getitem_vvvvvzt)
 {
 	// set the function logic
-	if (gettype_vvvvvzu == 1 || gettype_vvvvvzu == 3)
+	if (add_php_after_getitem_vvvvvzt == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzt Some function
+function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt)
+{
+	// set the function logic
+	if (gettype_vvvvvzt == 1 || gettype_vvvvvzt == 3)
 	{
 		return true;
 	}
@@ -921,20 +845,8 @@ function gettype_vvvvvzu_SomeFunc(gettype_vvvvvzu)
 }
 
 // the vvvvvzv function
-function vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv)
+function vvvvvzv(gettype_vvvvvzv)
 {
-	if (isSet(add_php_getlistquery_vvvvvzv) && add_php_getlistquery_vvvvvzv.constructor !== Array)
-	{
-		var temp_vvvvvzv = add_php_getlistquery_vvvvvzv;
-		var add_php_getlistquery_vvvvvzv = [];
-		add_php_getlistquery_vvvvvzv.push(temp_vvvvvzv);
-	}
-	else if (!isSet(add_php_getlistquery_vvvvvzv))
-	{
-		var add_php_getlistquery_vvvvvzv = [];
-	}
-	var add_php_getlistquery = add_php_getlistquery_vvvvvzv.some(add_php_getlistquery_vvvvvzv_SomeFunc);
-
 	if (isSet(gettype_vvvvvzv) && gettype_vvvvvzv.constructor !== Array)
 	{
 		var temp_vvvvvzv = gettype_vvvvvzv;
@@ -949,50 +861,59 @@ function vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv)
 
 
 	// set this function logic
-	if (add_php_getlistquery && gettype)
+	if (gettype)
 	{
-		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
-		// add required attribute to php_getlistquery field
+		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
+		// add required attribute to add_php_after_getitem field
+		if (jform_vvvvvzvvzk_required)
+		{
+			updateFieldRequired('add_php_after_getitem',0);
+			jQuery('#jform_add_php_after_getitem').prop('required','required');
+			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
+			jQuery('#jform_add_php_after_getitem').addClass('required');
+			jform_vvvvvzvvzk_required = false;
+		}
+		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
+		// add required attribute to add_php_before_getitem field
 		if (jform_vvvvvzvvzl_required)
 		{
-			updateFieldRequired('php_getlistquery',0);
-			jQuery('#jform_php_getlistquery').prop('required','required');
-			jQuery('#jform_php_getlistquery').attr('aria-required',true);
-			jQuery('#jform_php_getlistquery').addClass('required');
+			updateFieldRequired('add_php_before_getitem',0);
+			jQuery('#jform_add_php_before_getitem').prop('required','required');
+			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
+			jQuery('#jform_add_php_before_getitem').addClass('required');
 			jform_vvvvvzvvzl_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
-		// remove required attribute from php_getlistquery field
+		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
+		// remove required attribute from add_php_after_getitem field
+		if (!jform_vvvvvzvvzk_required)
+		{
+			updateFieldRequired('add_php_after_getitem',1);
+			jQuery('#jform_add_php_after_getitem').removeAttr('required');
+			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
+			jQuery('#jform_add_php_after_getitem').removeClass('required');
+			jform_vvvvvzvvzk_required = true;
+		}
+		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
+		// remove required attribute from add_php_before_getitem field
 		if (!jform_vvvvvzvvzl_required)
 		{
-			updateFieldRequired('php_getlistquery',1);
-			jQuery('#jform_php_getlistquery').removeAttr('required');
-			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
-			jQuery('#jform_php_getlistquery').removeClass('required');
+			updateFieldRequired('add_php_before_getitem',1);
+			jQuery('#jform_add_php_before_getitem').removeAttr('required');
+			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
+			jQuery('#jform_add_php_before_getitem').removeClass('required');
 			jform_vvvvvzvvzl_required = true;
 		}
 	}
 }
 
-// the vvvvvzv Some function
-function add_php_getlistquery_vvvvvzv_SomeFunc(add_php_getlistquery_vvvvvzv)
-{
-	// set the function logic
-	if (add_php_getlistquery_vvvvvzv == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzv Some function
 function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv)
 {
 	// set the function logic
-	if (gettype_vvvvvzv == 2 || gettype_vvvvvzv == 4)
+	if (gettype_vvvvvzv == 1 || gettype_vvvvvzv == 3)
 	{
 		return true;
 	}
@@ -1000,19 +921,19 @@ function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv)
 }
 
 // the vvvvvzw function
-function vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw)
+function vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw)
 {
-	if (isSet(add_php_before_getitems_vvvvvzw) && add_php_before_getitems_vvvvvzw.constructor !== Array)
+	if (isSet(add_php_getlistquery_vvvvvzw) && add_php_getlistquery_vvvvvzw.constructor !== Array)
 	{
-		var temp_vvvvvzw = add_php_before_getitems_vvvvvzw;
-		var add_php_before_getitems_vvvvvzw = [];
-		add_php_before_getitems_vvvvvzw.push(temp_vvvvvzw);
+		var temp_vvvvvzw = add_php_getlistquery_vvvvvzw;
+		var add_php_getlistquery_vvvvvzw = [];
+		add_php_getlistquery_vvvvvzw.push(temp_vvvvvzw);
 	}
-	else if (!isSet(add_php_before_getitems_vvvvvzw))
+	else if (!isSet(add_php_getlistquery_vvvvvzw))
 	{
-		var add_php_before_getitems_vvvvvzw = [];
+		var add_php_getlistquery_vvvvvzw = [];
 	}
-	var add_php_before_getitems = add_php_before_getitems_vvvvvzw.some(add_php_before_getitems_vvvvvzw_SomeFunc);
+	var add_php_getlistquery = add_php_getlistquery_vvvvvzw.some(add_php_getlistquery_vvvvvzw_SomeFunc);
 
 	if (isSet(gettype_vvvvvzw) && gettype_vvvvvzw.constructor !== Array)
 	{
@@ -1028,39 +949,39 @@ function vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw)
 
 
 	// set this function logic
-	if (add_php_before_getitems && gettype)
+	if (add_php_getlistquery && gettype)
 	{
-		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
-		// add required attribute to php_before_getitems field
+		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
+		// add required attribute to php_getlistquery field
 		if (jform_vvvvvzwvzm_required)
 		{
-			updateFieldRequired('php_before_getitems',0);
-			jQuery('#jform_php_before_getitems').prop('required','required');
-			jQuery('#jform_php_before_getitems').attr('aria-required',true);
-			jQuery('#jform_php_before_getitems').addClass('required');
+			updateFieldRequired('php_getlistquery',0);
+			jQuery('#jform_php_getlistquery').prop('required','required');
+			jQuery('#jform_php_getlistquery').attr('aria-required',true);
+			jQuery('#jform_php_getlistquery').addClass('required');
 			jform_vvvvvzwvzm_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_getitems field
+		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
+		// remove required attribute from php_getlistquery field
 		if (!jform_vvvvvzwvzm_required)
 		{
-			updateFieldRequired('php_before_getitems',1);
-			jQuery('#jform_php_before_getitems').removeAttr('required');
-			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitems').removeClass('required');
+			updateFieldRequired('php_getlistquery',1);
+			jQuery('#jform_php_getlistquery').removeAttr('required');
+			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
+			jQuery('#jform_php_getlistquery').removeClass('required');
 			jform_vvvvvzwvzm_required = true;
 		}
 	}
 }
 
 // the vvvvvzw Some function
-function add_php_before_getitems_vvvvvzw_SomeFunc(add_php_before_getitems_vvvvvzw)
+function add_php_getlistquery_vvvvvzw_SomeFunc(add_php_getlistquery_vvvvvzw)
 {
 	// set the function logic
-	if (add_php_before_getitems_vvvvvzw == 1)
+	if (add_php_getlistquery_vvvvvzw == 1)
 	{
 		return true;
 	}
@@ -1079,19 +1000,19 @@ function gettype_vvvvvzw_SomeFunc(gettype_vvvvvzw)
 }
 
 // the vvvvvzx function
-function vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx)
+function vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx)
 {
-	if (isSet(add_php_after_getitems_vvvvvzx) && add_php_after_getitems_vvvvvzx.constructor !== Array)
+	if (isSet(add_php_before_getitems_vvvvvzx) && add_php_before_getitems_vvvvvzx.constructor !== Array)
 	{
-		var temp_vvvvvzx = add_php_after_getitems_vvvvvzx;
-		var add_php_after_getitems_vvvvvzx = [];
-		add_php_after_getitems_vvvvvzx.push(temp_vvvvvzx);
+		var temp_vvvvvzx = add_php_before_getitems_vvvvvzx;
+		var add_php_before_getitems_vvvvvzx = [];
+		add_php_before_getitems_vvvvvzx.push(temp_vvvvvzx);
 	}
-	else if (!isSet(add_php_after_getitems_vvvvvzx))
+	else if (!isSet(add_php_before_getitems_vvvvvzx))
 	{
-		var add_php_after_getitems_vvvvvzx = [];
+		var add_php_before_getitems_vvvvvzx = [];
 	}
-	var add_php_after_getitems = add_php_after_getitems_vvvvvzx.some(add_php_after_getitems_vvvvvzx_SomeFunc);
+	var add_php_before_getitems = add_php_before_getitems_vvvvvzx.some(add_php_before_getitems_vvvvvzx_SomeFunc);
 
 	if (isSet(gettype_vvvvvzx) && gettype_vvvvvzx.constructor !== Array)
 	{
@@ -1107,39 +1028,39 @@ function vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx)
 
 
 	// set this function logic
-	if (add_php_after_getitems && gettype)
+	if (add_php_before_getitems && gettype)
 	{
-		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
-		// add required attribute to php_after_getitems field
+		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
+		// add required attribute to php_before_getitems field
 		if (jform_vvvvvzxvzn_required)
 		{
-			updateFieldRequired('php_after_getitems',0);
-			jQuery('#jform_php_after_getitems').prop('required','required');
-			jQuery('#jform_php_after_getitems').attr('aria-required',true);
-			jQuery('#jform_php_after_getitems').addClass('required');
+			updateFieldRequired('php_before_getitems',0);
+			jQuery('#jform_php_before_getitems').prop('required','required');
+			jQuery('#jform_php_before_getitems').attr('aria-required',true);
+			jQuery('#jform_php_before_getitems').addClass('required');
 			jform_vvvvvzxvzn_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_getitems field
+		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_getitems field
 		if (!jform_vvvvvzxvzn_required)
 		{
-			updateFieldRequired('php_after_getitems',1);
-			jQuery('#jform_php_after_getitems').removeAttr('required');
-			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitems').removeClass('required');
+			updateFieldRequired('php_before_getitems',1);
+			jQuery('#jform_php_before_getitems').removeAttr('required');
+			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
+			jQuery('#jform_php_before_getitems').removeClass('required');
 			jform_vvvvvzxvzn_required = true;
 		}
 	}
 }
 
 // the vvvvvzx Some function
-function add_php_after_getitems_vvvvvzx_SomeFunc(add_php_after_getitems_vvvvvzx)
+function add_php_before_getitems_vvvvvzx_SomeFunc(add_php_before_getitems_vvvvvzx)
 {
 	// set the function logic
-	if (add_php_after_getitems_vvvvvzx == 1)
+	if (add_php_before_getitems_vvvvvzx == 1)
 	{
 		return true;
 	}
@@ -1157,96 +1078,79 @@ function gettype_vvvvvzx_SomeFunc(gettype_vvvvvzx)
 	return false;
 }
 
-// the vvvvvzz function
-function vvvvvzz(gettype_vvvvvzz)
+// the vvvvvzy function
+function vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy)
 {
-	if (isSet(gettype_vvvvvzz) && gettype_vvvvvzz.constructor !== Array)
+	if (isSet(add_php_after_getitems_vvvvvzy) && add_php_after_getitems_vvvvvzy.constructor !== Array)
 	{
-		var temp_vvvvvzz = gettype_vvvvvzz;
-		var gettype_vvvvvzz = [];
-		gettype_vvvvvzz.push(temp_vvvvvzz);
+		var temp_vvvvvzy = add_php_after_getitems_vvvvvzy;
+		var add_php_after_getitems_vvvvvzy = [];
+		add_php_after_getitems_vvvvvzy.push(temp_vvvvvzy);
 	}
-	else if (!isSet(gettype_vvvvvzz))
+	else if (!isSet(add_php_after_getitems_vvvvvzy))
 	{
-		var gettype_vvvvvzz = [];
+		var add_php_after_getitems_vvvvvzy = [];
 	}
-	var gettype = gettype_vvvvvzz.some(gettype_vvvvvzz_SomeFunc);
+	var add_php_after_getitems = add_php_after_getitems_vvvvvzy.some(add_php_after_getitems_vvvvvzy_SomeFunc);
+
+	if (isSet(gettype_vvvvvzy) && gettype_vvvvvzy.constructor !== Array)
+	{
+		var temp_vvvvvzy = gettype_vvvvvzy;
+		var gettype_vvvvvzy = [];
+		gettype_vvvvvzy.push(temp_vvvvvzy);
+	}
+	else if (!isSet(gettype_vvvvvzy))
+	{
+		var gettype_vvvvvzy = [];
+	}
+	var gettype = gettype_vvvvvzy.some(gettype_vvvvvzy_SomeFunc);
 
 
 	// set this function logic
-	if (gettype)
+	if (add_php_after_getitems && gettype)
 	{
-		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		// add required attribute to add_php_after_getitems field
-		if (jform_vvvvvzzvzo_required)
+		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
+		// add required attribute to php_after_getitems field
+		if (jform_vvvvvzyvzo_required)
 		{
-			updateFieldRequired('add_php_after_getitems',0);
-			jQuery('#jform_add_php_after_getitems').prop('required','required');
-			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
-			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvvzzvzo_required = false;
-		}
-		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		// add required attribute to add_php_before_getitems field
-		if (jform_vvvvvzzvzp_required)
-		{
-			updateFieldRequired('add_php_before_getitems',0);
-			jQuery('#jform_add_php_before_getitems').prop('required','required');
-			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
-			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvvzzvzp_required = false;
-		}
-		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		// add required attribute to add_php_getlistquery field
-		if (jform_vvvvvzzvzq_required)
-		{
-			updateFieldRequired('add_php_getlistquery',0);
-			jQuery('#jform_add_php_getlistquery').prop('required','required');
-			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
-			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvvzzvzq_required = false;
+			updateFieldRequired('php_after_getitems',0);
+			jQuery('#jform_php_after_getitems').prop('required','required');
+			jQuery('#jform_php_after_getitems').attr('aria-required',true);
+			jQuery('#jform_php_after_getitems').addClass('required');
+			jform_vvvvvzyvzo_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		// remove required attribute from add_php_after_getitems field
-		if (!jform_vvvvvzzvzo_required)
+		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_getitems field
+		if (!jform_vvvvvzyvzo_required)
 		{
-			updateFieldRequired('add_php_after_getitems',1);
-			jQuery('#jform_add_php_after_getitems').removeAttr('required');
-			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
-			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvvzzvzo_required = true;
-		}
-		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		// remove required attribute from add_php_before_getitems field
-		if (!jform_vvvvvzzvzp_required)
-		{
-			updateFieldRequired('add_php_before_getitems',1);
-			jQuery('#jform_add_php_before_getitems').removeAttr('required');
-			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
-			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvvzzvzp_required = true;
-		}
-		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		// remove required attribute from add_php_getlistquery field
-		if (!jform_vvvvvzzvzq_required)
-		{
-			updateFieldRequired('add_php_getlistquery',1);
-			jQuery('#jform_add_php_getlistquery').removeAttr('required');
-			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
-			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvvzzvzq_required = true;
+			updateFieldRequired('php_after_getitems',1);
+			jQuery('#jform_php_after_getitems').removeAttr('required');
+			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
+			jQuery('#jform_php_after_getitems').removeClass('required');
+			jform_vvvvvzyvzo_required = true;
 		}
 	}
 }
 
-// the vvvvvzz Some function
-function gettype_vvvvvzz_SomeFunc(gettype_vvvvvzz)
+// the vvvvvzy Some function
+function add_php_after_getitems_vvvvvzy_SomeFunc(add_php_after_getitems_vvvvvzy)
 {
 	// set the function logic
-	if (gettype_vvvvvzz == 2 || gettype_vvvvvzz == 4)
+	if (add_php_after_getitems_vvvvvzy == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzy Some function
+function gettype_vvvvvzy_SomeFunc(gettype_vvvvvzy)
+{
+	// set the function logic
+	if (gettype_vvvvvzy == 2 || gettype_vvvvvzy == 4)
 	{
 		return true;
 	}
@@ -1272,27 +1176,67 @@ function vvvvwaa(gettype_vvvvwaa)
 	// set this function logic
 	if (gettype)
 	{
-		jQuery('#jform_pagination').closest('.control-group').show();
-		// add required attribute to pagination field
+		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
+		// add required attribute to add_php_after_getitems field
+		if (jform_vvvvwaavzp_required)
+		{
+			updateFieldRequired('add_php_after_getitems',0);
+			jQuery('#jform_add_php_after_getitems').prop('required','required');
+			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
+			jQuery('#jform_add_php_after_getitems').addClass('required');
+			jform_vvvvwaavzp_required = false;
+		}
+		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
+		// add required attribute to add_php_before_getitems field
+		if (jform_vvvvwaavzq_required)
+		{
+			updateFieldRequired('add_php_before_getitems',0);
+			jQuery('#jform_add_php_before_getitems').prop('required','required');
+			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
+			jQuery('#jform_add_php_before_getitems').addClass('required');
+			jform_vvvvwaavzq_required = false;
+		}
+		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
+		// add required attribute to add_php_getlistquery field
 		if (jform_vvvvwaavzr_required)
 		{
-			updateFieldRequired('pagination',0);
-			jQuery('#jform_pagination').prop('required','required');
-			jQuery('#jform_pagination').attr('aria-required',true);
-			jQuery('#jform_pagination').addClass('required');
+			updateFieldRequired('add_php_getlistquery',0);
+			jQuery('#jform_add_php_getlistquery').prop('required','required');
+			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
+			jQuery('#jform_add_php_getlistquery').addClass('required');
 			jform_vvvvwaavzr_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_pagination').closest('.control-group').hide();
-		// remove required attribute from pagination field
+		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
+		// remove required attribute from add_php_after_getitems field
+		if (!jform_vvvvwaavzp_required)
+		{
+			updateFieldRequired('add_php_after_getitems',1);
+			jQuery('#jform_add_php_after_getitems').removeAttr('required');
+			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
+			jQuery('#jform_add_php_after_getitems').removeClass('required');
+			jform_vvvvwaavzp_required = true;
+		}
+		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
+		// remove required attribute from add_php_before_getitems field
+		if (!jform_vvvvwaavzq_required)
+		{
+			updateFieldRequired('add_php_before_getitems',1);
+			jQuery('#jform_add_php_before_getitems').removeAttr('required');
+			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
+			jQuery('#jform_add_php_before_getitems').removeClass('required');
+			jform_vvvvwaavzq_required = true;
+		}
+		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
+		// remove required attribute from add_php_getlistquery field
 		if (!jform_vvvvwaavzr_required)
 		{
-			updateFieldRequired('pagination',1);
-			jQuery('#jform_pagination').removeAttr('required');
-			jQuery('#jform_pagination').removeAttr('aria-required');
-			jQuery('#jform_pagination').removeClass('required');
+			updateFieldRequired('add_php_getlistquery',1);
+			jQuery('#jform_add_php_getlistquery').removeAttr('required');
+			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
+			jQuery('#jform_add_php_getlistquery').removeClass('required');
 			jform_vvvvwaavzr_required = true;
 		}
 	}
@@ -1302,7 +1246,7 @@ function vvvvwaa(gettype_vvvvwaa)
 function gettype_vvvvwaa_SomeFunc(gettype_vvvvwaa)
 {
 	// set the function logic
-	if (gettype_vvvvwaa == 2)
+	if (gettype_vvvvwaa == 2 || gettype_vvvvwaa == 4)
 	{
 		return true;
 	}
@@ -1328,27 +1272,27 @@ function vvvvwab(gettype_vvvvwab)
 	// set this function logic
 	if (gettype)
 	{
-		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
-		// add required attribute to add_php_router_parse field
+		jQuery('#jform_pagination').closest('.control-group').show();
+		// add required attribute to pagination field
 		if (jform_vvvvwabvzs_required)
 		{
-			updateFieldRequired('add_php_router_parse',0);
-			jQuery('#jform_add_php_router_parse').prop('required','required');
-			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
-			jQuery('#jform_add_php_router_parse').addClass('required');
+			updateFieldRequired('pagination',0);
+			jQuery('#jform_pagination').prop('required','required');
+			jQuery('#jform_pagination').attr('aria-required',true);
+			jQuery('#jform_pagination').addClass('required');
 			jform_vvvvwabvzs_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
-		// remove required attribute from add_php_router_parse field
+		jQuery('#jform_pagination').closest('.control-group').hide();
+		// remove required attribute from pagination field
 		if (!jform_vvvvwabvzs_required)
 		{
-			updateFieldRequired('add_php_router_parse',1);
-			jQuery('#jform_add_php_router_parse').removeAttr('required');
-			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
-			jQuery('#jform_add_php_router_parse').removeClass('required');
+			updateFieldRequired('pagination',1);
+			jQuery('#jform_pagination').removeAttr('required');
+			jQuery('#jform_pagination').removeAttr('aria-required');
+			jQuery('#jform_pagination').removeClass('required');
 			jform_vvvvwabvzs_required = true;
 		}
 	}
@@ -1358,7 +1302,7 @@ function vvvvwab(gettype_vvvvwab)
 function gettype_vvvvwab_SomeFunc(gettype_vvvvwab)
 {
 	// set the function logic
-	if (gettype_vvvvwab == 1 || gettype_vvvvwab == 2)
+	if (gettype_vvvvwab == 2)
 	{
 		return true;
 	}
@@ -1366,7 +1310,7 @@ function gettype_vvvvwab_SomeFunc(gettype_vvvvwab)
 }
 
 // the vvvvwac function
-function vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac)
+function vvvvwac(gettype_vvvvwac)
 {
 	if (isSet(gettype_vvvvwac) && gettype_vvvvwac.constructor !== Array)
 	{
@@ -1380,43 +1324,31 @@ function vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac)
 	}
 	var gettype = gettype_vvvvwac.some(gettype_vvvvwac_SomeFunc);
 
-	if (isSet(add_php_router_parse_vvvvwac) && add_php_router_parse_vvvvwac.constructor !== Array)
-	{
-		var temp_vvvvwac = add_php_router_parse_vvvvwac;
-		var add_php_router_parse_vvvvwac = [];
-		add_php_router_parse_vvvvwac.push(temp_vvvvwac);
-	}
-	else if (!isSet(add_php_router_parse_vvvvwac))
-	{
-		var add_php_router_parse_vvvvwac = [];
-	}
-	var add_php_router_parse = add_php_router_parse_vvvvwac.some(add_php_router_parse_vvvvwac_SomeFunc);
-
 
 	// set this function logic
-	if (gettype && add_php_router_parse)
+	if (gettype)
 	{
-		jQuery('#jform_php_router_parse').closest('.control-group').show();
-		// add required attribute to php_router_parse field
+		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
+		// add required attribute to add_php_router_parse field
 		if (jform_vvvvwacvzt_required)
 		{
-			updateFieldRequired('php_router_parse',0);
-			jQuery('#jform_php_router_parse').prop('required','required');
-			jQuery('#jform_php_router_parse').attr('aria-required',true);
-			jQuery('#jform_php_router_parse').addClass('required');
+			updateFieldRequired('add_php_router_parse',0);
+			jQuery('#jform_add_php_router_parse').prop('required','required');
+			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
+			jQuery('#jform_add_php_router_parse').addClass('required');
 			jform_vvvvwacvzt_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_router_parse').closest('.control-group').hide();
-		// remove required attribute from php_router_parse field
+		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
+		// remove required attribute from add_php_router_parse field
 		if (!jform_vvvvwacvzt_required)
 		{
-			updateFieldRequired('php_router_parse',1);
-			jQuery('#jform_php_router_parse').removeAttr('required');
-			jQuery('#jform_php_router_parse').removeAttr('aria-required');
-			jQuery('#jform_php_router_parse').removeClass('required');
+			updateFieldRequired('add_php_router_parse',1);
+			jQuery('#jform_add_php_router_parse').removeAttr('required');
+			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
+			jQuery('#jform_add_php_router_parse').removeClass('required');
 			jform_vvvvwacvzt_required = true;
 		}
 	}
@@ -1433,31 +1365,99 @@ function gettype_vvvvwac_SomeFunc(gettype_vvvvwac)
 	return false;
 }
 
-// the vvvvwac Some function
-function add_php_router_parse_vvvvwac_SomeFunc(add_php_router_parse_vvvvwac)
+// the vvvvwad function
+function vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad)
+{
+	if (isSet(gettype_vvvvwad) && gettype_vvvvwad.constructor !== Array)
+	{
+		var temp_vvvvwad = gettype_vvvvwad;
+		var gettype_vvvvwad = [];
+		gettype_vvvvwad.push(temp_vvvvwad);
+	}
+	else if (!isSet(gettype_vvvvwad))
+	{
+		var gettype_vvvvwad = [];
+	}
+	var gettype = gettype_vvvvwad.some(gettype_vvvvwad_SomeFunc);
+
+	if (isSet(add_php_router_parse_vvvvwad) && add_php_router_parse_vvvvwad.constructor !== Array)
+	{
+		var temp_vvvvwad = add_php_router_parse_vvvvwad;
+		var add_php_router_parse_vvvvwad = [];
+		add_php_router_parse_vvvvwad.push(temp_vvvvwad);
+	}
+	else if (!isSet(add_php_router_parse_vvvvwad))
+	{
+		var add_php_router_parse_vvvvwad = [];
+	}
+	var add_php_router_parse = add_php_router_parse_vvvvwad.some(add_php_router_parse_vvvvwad_SomeFunc);
+
+
+	// set this function logic
+	if (gettype && add_php_router_parse)
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').show();
+		// add required attribute to php_router_parse field
+		if (jform_vvvvwadvzu_required)
+		{
+			updateFieldRequired('php_router_parse',0);
+			jQuery('#jform_php_router_parse').prop('required','required');
+			jQuery('#jform_php_router_parse').attr('aria-required',true);
+			jQuery('#jform_php_router_parse').addClass('required');
+			jform_vvvvwadvzu_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').hide();
+		// remove required attribute from php_router_parse field
+		if (!jform_vvvvwadvzu_required)
+		{
+			updateFieldRequired('php_router_parse',1);
+			jQuery('#jform_php_router_parse').removeAttr('required');
+			jQuery('#jform_php_router_parse').removeAttr('aria-required');
+			jQuery('#jform_php_router_parse').removeClass('required');
+			jform_vvvvwadvzu_required = true;
+		}
+	}
+}
+
+// the vvvvwad Some function
+function gettype_vvvvwad_SomeFunc(gettype_vvvvwad)
 {
 	// set the function logic
-	if (add_php_router_parse_vvvvwac == 1)
+	if (gettype_vvvvwad == 1 || gettype_vvvvwad == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwae function
-function vvvvwae(gettype_vvvvwae)
+// the vvvvwad Some function
+function add_php_router_parse_vvvvwad_SomeFunc(add_php_router_parse_vvvvwad)
 {
-	if (isSet(gettype_vvvvwae) && gettype_vvvvwae.constructor !== Array)
+	// set the function logic
+	if (add_php_router_parse_vvvvwad == 1)
 	{
-		var temp_vvvvwae = gettype_vvvvwae;
-		var gettype_vvvvwae = [];
-		gettype_vvvvwae.push(temp_vvvvwae);
+		return true;
 	}
-	else if (!isSet(gettype_vvvvwae))
+	return false;
+}
+
+// the vvvvwaf function
+function vvvvwaf(gettype_vvvvwaf)
+{
+	if (isSet(gettype_vvvvwaf) && gettype_vvvvwaf.constructor !== Array)
 	{
-		var gettype_vvvvwae = [];
+		var temp_vvvvwaf = gettype_vvvvwaf;
+		var gettype_vvvvwaf = [];
+		gettype_vvvvwaf.push(temp_vvvvwaf);
 	}
-	var gettype = gettype_vvvvwae.some(gettype_vvvvwae_SomeFunc);
+	else if (!isSet(gettype_vvvvwaf))
+	{
+		var gettype_vvvvwaf = [];
+	}
+	var gettype = gettype_vvvvwaf.some(gettype_vvvvwaf_SomeFunc);
 
 
 	// set this function logic
@@ -1471,11 +1471,11 @@ function vvvvwae(gettype_vvvvwae)
 	}
 }
 
-// the vvvvwae Some function
-function gettype_vvvvwae_SomeFunc(gettype_vvvvwae)
+// the vvvvwaf Some function
+function gettype_vvvvwaf_SomeFunc(gettype_vvvvwaf)
 {
 	// set the function logic
-	if (gettype_vvvvwae == 1)
+	if (gettype_vvvvwaf == 1)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index 01ea9b93b..b0d87bb6f 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -9,61 +9,61 @@
  */
 
 // Some Global Values
-jform_vvvvwarwaa_required = false;
 jform_vvvvwaswab_required = false;
 jform_vvvvwatwac_required = false;
 jform_vvvvwauwad_required = false;
-jform_vvvvwaxwae_required = false;
+jform_vvvvwavwae_required = false;
 jform_vvvvwaywaf_required = false;
 jform_vvvvwazwag_required = false;
 jform_vvvvwbawah_required = false;
+jform_vvvvwbbwai_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwar = jQuery("#jform_datalenght").val();
-	vvvvwar(datalenght_vvvvwar);
+	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
+	vvvvwas(datalenght_vvvvwas);
 
-	var datadefault_vvvvwas = jQuery("#jform_datadefault").val();
-	vvvvwas(datadefault_vvvvwas);
-
-	var datatype_vvvvwat = jQuery("#jform_datatype").val();
-	vvvvwat(datatype_vvvvwat);
+	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
+	vvvvwat(datadefault_vvvvwat);
 
 	var datatype_vvvvwau = jQuery("#jform_datatype").val();
 	vvvvwau(datatype_vvvvwau);
 
-	var store_vvvvwav = jQuery("#jform_store").val();
 	var datatype_vvvvwav = jQuery("#jform_datatype").val();
-	vvvvwav(store_vvvvwav,datatype_vvvvwav);
+	vvvvwav(datatype_vvvvwav);
 
-	var add_css_view_vvvvwax = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwax(add_css_view_vvvvwax);
+	var store_vvvvwaw = jQuery("#jform_store").val();
+	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
+	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
 
-	var add_css_views_vvvvway = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvway(add_css_views_vvvvway);
+	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvway(add_css_view_vvvvway);
 
-	var add_javascript_view_footer_vvvvwaz = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwaz(add_javascript_view_footer_vvvvwaz);
+	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwaz(add_css_views_vvvvwaz);
 
-	var add_javascript_views_footer_vvvvwba = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_views_footer_vvvvwba);
+	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwba(add_javascript_view_footer_vvvvwba);
+
+	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbb(add_javascript_views_footer_vvvvwbb);
 });
 
-// the vvvvwar function
-function vvvvwar(datalenght_vvvvwar)
+// the vvvvwas function
+function vvvvwas(datalenght_vvvvwas)
 {
-	if (isSet(datalenght_vvvvwar) && datalenght_vvvvwar.constructor !== Array)
+	if (isSet(datalenght_vvvvwas) && datalenght_vvvvwas.constructor !== Array)
 	{
-		var temp_vvvvwar = datalenght_vvvvwar;
-		var datalenght_vvvvwar = [];
-		datalenght_vvvvwar.push(temp_vvvvwar);
+		var temp_vvvvwas = datalenght_vvvvwas;
+		var datalenght_vvvvwas = [];
+		datalenght_vvvvwas.push(temp_vvvvwas);
 	}
-	else if (!isSet(datalenght_vvvvwar))
+	else if (!isSet(datalenght_vvvvwas))
 	{
-		var datalenght_vvvvwar = [];
+		var datalenght_vvvvwas = [];
 	}
-	var datalenght = datalenght_vvvvwar.some(datalenght_vvvvwar_SomeFunc);
+	var datalenght = datalenght_vvvvwas.some(datalenght_vvvvwas_SomeFunc);
 
 
 	// set this function logic
@@ -71,91 +71,35 @@ function vvvvwar(datalenght_vvvvwar)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwarwaa_required)
+		if (jform_vvvvwaswab_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwarwaa_required = false;
+			jform_vvvvwaswab_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwarwaa_required)
+		if (!jform_vvvvwaswab_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwarwaa_required = true;
-		}
-	}
-}
-
-// the vvvvwar Some function
-function datalenght_vvvvwar_SomeFunc(datalenght_vvvvwar)
-{
-	// set the function logic
-	if (datalenght_vvvvwar == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwas function
-function vvvvwas(datadefault_vvvvwas)
-{
-	if (isSet(datadefault_vvvvwas) && datadefault_vvvvwas.constructor !== Array)
-	{
-		var temp_vvvvwas = datadefault_vvvvwas;
-		var datadefault_vvvvwas = [];
-		datadefault_vvvvwas.push(temp_vvvvwas);
-	}
-	else if (!isSet(datadefault_vvvvwas))
-	{
-		var datadefault_vvvvwas = [];
-	}
-	var datadefault = datadefault_vvvvwas.some(datadefault_vvvvwas_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		// add required attribute to datadefault_other field
-		if (jform_vvvvwaswab_required)
-		{
-			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwaswab_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwaswab_required)
-		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwaswab_required = true;
 		}
 	}
 }
 
 // the vvvvwas Some function
-function datadefault_vvvvwas_SomeFunc(datadefault_vvvvwas)
+function datalenght_vvvvwas_SomeFunc(datalenght_vvvvwas)
 {
 	// set the function logic
-	if (datadefault_vvvvwas == 'Other')
+	if (datalenght_vvvvwas == 'Other')
 	{
 		return true;
 	}
@@ -163,59 +107,55 @@ function datadefault_vvvvwas_SomeFunc(datadefault_vvvvwas)
 }
 
 // the vvvvwat function
-function vvvvwat(datatype_vvvvwat)
+function vvvvwat(datadefault_vvvvwat)
 {
-	if (isSet(datatype_vvvvwat) && datatype_vvvvwat.constructor !== Array)
+	if (isSet(datadefault_vvvvwat) && datadefault_vvvvwat.constructor !== Array)
 	{
-		var temp_vvvvwat = datatype_vvvvwat;
-		var datatype_vvvvwat = [];
-		datatype_vvvvwat.push(temp_vvvvwat);
+		var temp_vvvvwat = datadefault_vvvvwat;
+		var datadefault_vvvvwat = [];
+		datadefault_vvvvwat.push(temp_vvvvwat);
 	}
-	else if (!isSet(datatype_vvvvwat))
+	else if (!isSet(datadefault_vvvvwat))
 	{
-		var datatype_vvvvwat = [];
+		var datadefault_vvvvwat = [];
 	}
-	var datatype = datatype_vvvvwat.some(datatype_vvvvwat_SomeFunc);
+	var datadefault = datadefault_vvvvwat.some(datadefault_vvvvwat_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
+		// add required attribute to datadefault_other field
 		if (jform_vvvvwatwac_required)
 		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
+			updateFieldRequired('datadefault_other',0);
+			jQuery('#jform_datadefault_other').prop('required','required');
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwatwac_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		// remove required attribute from indexes field
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
+		// remove required attribute from datadefault_other field
 		if (!jform_vvvvwatwac_required)
 		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			updateFieldRequired('datadefault_other',1);
+			jQuery('#jform_datadefault_other').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwatwac_required = true;
 		}
 	}
 }
 
 // the vvvvwat Some function
-function datatype_vvvvwat_SomeFunc(datatype_vvvvwat)
+function datadefault_vvvvwat_SomeFunc(datadefault_vvvvwat)
 {
 	// set the function logic
-	if (datatype_vvvvwat == 'CHAR' || datatype_vvvvwat == 'VARCHAR' || datatype_vvvvwat == 'DATETIME' || datatype_vvvvwat == 'DATE' || datatype_vvvvwat == 'TIME' || datatype_vvvvwat == 'INT' || datatype_vvvvwat == 'TINYINT' || datatype_vvvvwat == 'BIGINT' || datatype_vvvvwat == 'FLOAT' || datatype_vvvvwat == 'DECIMAL' || datatype_vvvvwat == 'DOUBLE')
+	if (datadefault_vvvvwat == 'Other')
 	{
 		return true;
 	}
@@ -241,27 +181,31 @@ function vvvvwau(datatype_vvvvwau)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
 		if (jform_vvvvwauwad_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwauwad_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
 		if (!jform_vvvvwauwad_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwauwad_required = true;
 		}
 	}
@@ -271,7 +215,7 @@ function vvvvwau(datatype_vvvvwau)
 function datatype_vvvvwau_SomeFunc(datatype_vvvvwau)
 {
 	// set the function logic
-	if (datatype_vvvvwau == 'CHAR' || datatype_vvvvwau == 'VARCHAR' || datatype_vvvvwau == 'TEXT' || datatype_vvvvwau == 'MEDIUMTEXT' || datatype_vvvvwau == 'LONGTEXT' || datatype_vvvvwau == 'BLOB' || datatype_vvvvwau == 'TINYBLOB' || datatype_vvvvwau == 'MEDIUMBLOB' || datatype_vvvvwau == 'LONGBLOB')
+	if (datatype_vvvvwau == 'CHAR' || datatype_vvvvwau == 'VARCHAR' || datatype_vvvvwau == 'DATETIME' || datatype_vvvvwau == 'DATE' || datatype_vvvvwau == 'TIME' || datatype_vvvvwau == 'INT' || datatype_vvvvwau == 'TINYINT' || datatype_vvvvwau == 'BIGINT' || datatype_vvvvwau == 'FLOAT' || datatype_vvvvwau == 'DECIMAL' || datatype_vvvvwau == 'DOUBLE')
 	{
 		return true;
 	}
@@ -279,20 +223,8 @@ function datatype_vvvvwau_SomeFunc(datatype_vvvvwau)
 }
 
 // the vvvvwav function
-function vvvvwav(store_vvvvwav,datatype_vvvvwav)
+function vvvvwav(datatype_vvvvwav)
 {
-	if (isSet(store_vvvvwav) && store_vvvvwav.constructor !== Array)
-	{
-		var temp_vvvvwav = store_vvvvwav;
-		var store_vvvvwav = [];
-		store_vvvvwav.push(temp_vvvvwav);
-	}
-	else if (!isSet(store_vvvvwav))
-	{
-		var store_vvvvwav = [];
-	}
-	var store = store_vvvvwav.some(store_vvvvwav_SomeFunc);
-
 	if (isSet(datatype_vvvvwav) && datatype_vvvvwav.constructor !== Array)
 	{
 		var temp_vvvvwav = datatype_vvvvwav;
@@ -307,27 +239,34 @@ function vvvvwav(store_vvvvwav,datatype_vvvvwav)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwavwae_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwavwae_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		// remove required attribute from store field
+		if (!jform_vvvvwavwae_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwavwae_required = true;
+		}
 	}
 }
 
-// the vvvvwav Some function
-function store_vvvvwav_SomeFunc(store_vvvvwav)
-{
-	// set the function logic
-	if (store_vvvvwav == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwav Some function
 function datatype_vvvvwav_SomeFunc(datatype_vvvvwav)
 {
@@ -339,130 +278,191 @@ function datatype_vvvvwav_SomeFunc(datatype_vvvvwav)
 	return false;
 }
 
-// the vvvvwax function
-function vvvvwax(add_css_view_vvvvwax)
+// the vvvvwaw function
+function vvvvwaw(store_vvvvwaw,datatype_vvvvwaw)
+{
+	if (isSet(store_vvvvwaw) && store_vvvvwaw.constructor !== Array)
+	{
+		var temp_vvvvwaw = store_vvvvwaw;
+		var store_vvvvwaw = [];
+		store_vvvvwaw.push(temp_vvvvwaw);
+	}
+	else if (!isSet(store_vvvvwaw))
+	{
+		var store_vvvvwaw = [];
+	}
+	var store = store_vvvvwaw.some(store_vvvvwaw_SomeFunc);
+
+	if (isSet(datatype_vvvvwaw) && datatype_vvvvwaw.constructor !== Array)
+	{
+		var temp_vvvvwaw = datatype_vvvvwaw;
+		var datatype_vvvvwaw = [];
+		datatype_vvvvwaw.push(temp_vvvvwaw);
+	}
+	else if (!isSet(datatype_vvvvwaw))
+	{
+		var datatype_vvvvwaw = [];
+	}
+	var datatype = datatype_vvvvwaw.some(datatype_vvvvwaw_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwaw Some function
+function store_vvvvwaw_SomeFunc(store_vvvvwaw)
 {
 	// set the function logic
-	if (add_css_view_vvvvwax == 1)
+	if (store_vvvvwaw == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaw Some function
+function datatype_vvvvwaw_SomeFunc(datatype_vvvvwaw)
+{
+	// set the function logic
+	if (datatype_vvvvwaw == 'CHAR' || datatype_vvvvwaw == 'VARCHAR' || datatype_vvvvwaw == 'TEXT' || datatype_vvvvwaw == 'MEDIUMTEXT' || datatype_vvvvwaw == 'LONGTEXT' || datatype_vvvvwaw == 'BLOB' || datatype_vvvvwaw == 'TINYBLOB' || datatype_vvvvwaw == 'MEDIUMBLOB' || datatype_vvvvwaw == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvway function
+function vvvvway(add_css_view_vvvvway)
+{
+	// set the function logic
+	if (add_css_view_vvvvway == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 		// add required attribute to css_view field
-		if (jform_vvvvwaxwae_required)
+		if (jform_vvvvwaywaf_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwaxwae_required = false;
+			jform_vvvvwaywaf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
 		// remove required attribute from css_view field
-		if (!jform_vvvvwaxwae_required)
+		if (!jform_vvvvwaywaf_required)
 		{
 			updateFieldRequired('css_view',1);
 			jQuery('#jform_css_view').removeAttr('required');
 			jQuery('#jform_css_view').removeAttr('aria-required');
 			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwaxwae_required = true;
-		}
-	}
-}
-
-// the vvvvway function
-function vvvvway(add_css_views_vvvvway)
-{
-	// set the function logic
-	if (add_css_views_vvvvway == 1)
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		// add required attribute to css_views field
-		if (jform_vvvvwaywaf_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwaywaf_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
-		// remove required attribute from css_views field
-		if (!jform_vvvvwaywaf_required)
-		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwaywaf_required = true;
 		}
 	}
 }
 
 // the vvvvwaz function
-function vvvvwaz(add_javascript_view_footer_vvvvwaz)
+function vvvvwaz(add_css_views_vvvvwaz)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwaz == 1)
+	if (add_css_views_vvvvwaz == 1)
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
-		// add required attribute to javascript_view_footer field
+		jQuery('#jform_css_views-lbl').closest('.control-group').show();
+		// add required attribute to css_views field
 		if (jform_vvvvwazwag_required)
 		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
+			updateFieldRequired('css_views',0);
+			jQuery('#jform_css_views').prop('required','required');
+			jQuery('#jform_css_views').attr('aria-required',true);
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwazwag_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_view_footer field
+		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
+		// remove required attribute from css_views field
 		if (!jform_vvvvwazwag_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwazwag_required = true;
 		}
 	}
 }
 
 // the vvvvwba function
-function vvvvwba(add_javascript_views_footer_vvvvwba)
+function vvvvwba(add_javascript_view_footer_vvvvwba)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwba == 1)
+	if (add_javascript_view_footer_vvvvwba == 1)
+	{
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
+		// add required attribute to javascript_view_footer field
+		if (jform_vvvvwbawah_required)
+		{
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
+			jform_vvvvwbawah_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_view_footer field
+		if (!jform_vvvvwbawah_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwbawah_required = true;
+		}
+	}
+}
+
+// the vvvvwbb function
+function vvvvwbb(add_javascript_views_footer_vvvvwbb)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwbb == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 		// add required attribute to javascript_views_footer field
-		if (jform_vvvvwbawah_required)
+		if (jform_vvvvwbbwai_required)
 		{
 			updateFieldRequired('javascript_views_footer',0);
 			jQuery('#jform_javascript_views_footer').prop('required','required');
 			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwbawah_required = false;
+			jform_vvvvwbbwai_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
 		// remove required attribute from javascript_views_footer field
-		if (!jform_vvvvwbawah_required)
+		if (!jform_vvvvwbbwai_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwbawah_required = true;
+			jform_vvvvwbbwai_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js
index 317cf5c28..052268414 100644
--- a/admin/models/forms/fieldtype.js
+++ b/admin/models/forms/fieldtype.js
@@ -9,82 +9,82 @@
  */
 
 // Some Global Values
-jform_vvvvwbbwai_required = false;
-jform_vvvvwbdwaj_required = false;
-jform_vvvvwbfwak_required = false;
+jform_vvvvwbcwaj_required = false;
+jform_vvvvwbewak_required = false;
 jform_vvvvwbgwal_required = false;
 jform_vvvvwbhwam_required = false;
-jform_vvvvwbmwan_required = false;
-jform_vvvvwbmwao_required = false;
+jform_vvvvwbiwan_required = false;
+jform_vvvvwbnwao_required = false;
+jform_vvvvwbnwap_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwbb = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb);
+	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
 
-	var datadefault_vvvvwbd = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd);
+	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
 
-	var datatype_vvvvwbf = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbf(datatype_vvvvwbf,has_defaults_vvvvwbf);
-
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg);
+	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
 
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
 
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
 
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
 	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
 
 	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbm(has_defaults_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbn(has_defaults_vvvvwbn);
 });
 
-// the vvvvwbb function
-function vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb)
+// the vvvvwbc function
+function vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc)
 {
-	if (isSet(datalenght_vvvvwbb) && datalenght_vvvvwbb.constructor !== Array)
+	if (isSet(datalenght_vvvvwbc) && datalenght_vvvvwbc.constructor !== Array)
 	{
-		var temp_vvvvwbb = datalenght_vvvvwbb;
-		var datalenght_vvvvwbb = [];
-		datalenght_vvvvwbb.push(temp_vvvvwbb);
+		var temp_vvvvwbc = datalenght_vvvvwbc;
+		var datalenght_vvvvwbc = [];
+		datalenght_vvvvwbc.push(temp_vvvvwbc);
 	}
-	else if (!isSet(datalenght_vvvvwbb))
+	else if (!isSet(datalenght_vvvvwbc))
 	{
-		var datalenght_vvvvwbb = [];
+		var datalenght_vvvvwbc = [];
 	}
-	var datalenght = datalenght_vvvvwbb.some(datalenght_vvvvwbb_SomeFunc);
+	var datalenght = datalenght_vvvvwbc.some(datalenght_vvvvwbc_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbb) && has_defaults_vvvvwbb.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbc) && has_defaults_vvvvwbc.constructor !== Array)
 	{
-		var temp_vvvvwbb = has_defaults_vvvvwbb;
-		var has_defaults_vvvvwbb = [];
-		has_defaults_vvvvwbb.push(temp_vvvvwbb);
+		var temp_vvvvwbc = has_defaults_vvvvwbc;
+		var has_defaults_vvvvwbc = [];
+		has_defaults_vvvvwbc.push(temp_vvvvwbc);
 	}
-	else if (!isSet(has_defaults_vvvvwbb))
+	else if (!isSet(has_defaults_vvvvwbc))
 	{
-		var has_defaults_vvvvwbb = [];
+		var has_defaults_vvvvwbc = [];
 	}
-	var has_defaults = has_defaults_vvvvwbb.some(has_defaults_vvvvwbb_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbc.some(has_defaults_vvvvwbc_SomeFunc);
 
 
 	// set this function logic
@@ -92,78 +92,78 @@ function vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbbwai_required)
+		if (jform_vvvvwbcwaj_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwbbwai_required = false;
+			jform_vvvvwbcwaj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbbwai_required)
+		if (!jform_vvvvwbcwaj_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwbbwai_required = true;
+			jform_vvvvwbcwaj_required = true;
 		}
 	}
 }
 
-// the vvvvwbb Some function
-function datalenght_vvvvwbb_SomeFunc(datalenght_vvvvwbb)
+// the vvvvwbc Some function
+function datalenght_vvvvwbc_SomeFunc(datalenght_vvvvwbc)
 {
 	// set the function logic
-	if (datalenght_vvvvwbb == 'Other')
+	if (datalenght_vvvvwbc == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbb Some function
-function has_defaults_vvvvwbb_SomeFunc(has_defaults_vvvvwbb)
+// the vvvvwbc Some function
+function has_defaults_vvvvwbc_SomeFunc(has_defaults_vvvvwbc)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbb == 1)
+	if (has_defaults_vvvvwbc == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbd function
-function vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd)
+// the vvvvwbe function
+function vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe)
 {
-	if (isSet(datadefault_vvvvwbd) && datadefault_vvvvwbd.constructor !== Array)
+	if (isSet(datadefault_vvvvwbe) && datadefault_vvvvwbe.constructor !== Array)
 	{
-		var temp_vvvvwbd = datadefault_vvvvwbd;
-		var datadefault_vvvvwbd = [];
-		datadefault_vvvvwbd.push(temp_vvvvwbd);
+		var temp_vvvvwbe = datadefault_vvvvwbe;
+		var datadefault_vvvvwbe = [];
+		datadefault_vvvvwbe.push(temp_vvvvwbe);
 	}
-	else if (!isSet(datadefault_vvvvwbd))
+	else if (!isSet(datadefault_vvvvwbe))
 	{
-		var datadefault_vvvvwbd = [];
+		var datadefault_vvvvwbe = [];
 	}
-	var datadefault = datadefault_vvvvwbd.some(datadefault_vvvvwbd_SomeFunc);
+	var datadefault = datadefault_vvvvwbe.some(datadefault_vvvvwbe_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbd) && has_defaults_vvvvwbd.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbe) && has_defaults_vvvvwbe.constructor !== Array)
 	{
-		var temp_vvvvwbd = has_defaults_vvvvwbd;
-		var has_defaults_vvvvwbd = [];
-		has_defaults_vvvvwbd.push(temp_vvvvwbd);
+		var temp_vvvvwbe = has_defaults_vvvvwbe;
+		var has_defaults_vvvvwbe = [];
+		has_defaults_vvvvwbe.push(temp_vvvvwbe);
 	}
-	else if (!isSet(has_defaults_vvvvwbd))
+	else if (!isSet(has_defaults_vvvvwbe))
 	{
-		var has_defaults_vvvvwbd = [];
+		var has_defaults_vvvvwbe = [];
 	}
-	var has_defaults = has_defaults_vvvvwbd.some(has_defaults_vvvvwbd_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbe.some(has_defaults_vvvvwbe_SomeFunc);
 
 
 	// set this function logic
@@ -171,129 +171,46 @@ function vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwbdwaj_required)
+		if (jform_vvvvwbewak_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwbdwaj_required = false;
+			jform_vvvvwbewak_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbdwaj_required)
+		if (!jform_vvvvwbewak_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwbdwaj_required = true;
+			jform_vvvvwbewak_required = true;
 		}
 	}
 }
 
-// the vvvvwbd Some function
-function datadefault_vvvvwbd_SomeFunc(datadefault_vvvvwbd)
+// the vvvvwbe Some function
+function datadefault_vvvvwbe_SomeFunc(datadefault_vvvvwbe)
 {
 	// set the function logic
-	if (datadefault_vvvvwbd == 'Other')
+	if (datadefault_vvvvwbe == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbd Some function
-function has_defaults_vvvvwbd_SomeFunc(has_defaults_vvvvwbd)
+// the vvvvwbe Some function
+function has_defaults_vvvvwbe_SomeFunc(has_defaults_vvvvwbe)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbd == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbf function
-function vvvvwbf(datatype_vvvvwbf,has_defaults_vvvvwbf)
-{
-	if (isSet(datatype_vvvvwbf) && datatype_vvvvwbf.constructor !== Array)
-	{
-		var temp_vvvvwbf = datatype_vvvvwbf;
-		var datatype_vvvvwbf = [];
-		datatype_vvvvwbf.push(temp_vvvvwbf);
-	}
-	else if (!isSet(datatype_vvvvwbf))
-	{
-		var datatype_vvvvwbf = [];
-	}
-	var datatype = datatype_vvvvwbf.some(datatype_vvvvwbf_SomeFunc);
-
-	if (isSet(has_defaults_vvvvwbf) && has_defaults_vvvvwbf.constructor !== Array)
-	{
-		var temp_vvvvwbf = has_defaults_vvvvwbf;
-		var has_defaults_vvvvwbf = [];
-		has_defaults_vvvvwbf.push(temp_vvvvwbf);
-	}
-	else if (!isSet(has_defaults_vvvvwbf))
-	{
-		var has_defaults_vvvvwbf = [];
-	}
-	var has_defaults = has_defaults_vvvvwbf.some(has_defaults_vvvvwbf_SomeFunc);
-
-
-	// set this function logic
-	if (datatype && has_defaults)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
-		if (jform_vvvvwbfwak_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbfwak_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		// remove required attribute from indexes field
-		if (!jform_vvvvwbfwak_required)
-		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbfwak_required = true;
-		}
-	}
-}
-
-// the vvvvwbf Some function
-function datatype_vvvvwbf_SomeFunc(datatype_vvvvwbf)
-{
-	// set the function logic
-	if (datatype_vvvvwbf == 'CHAR' || datatype_vvvvwbf == 'VARCHAR' || datatype_vvvvwbf == 'DATETIME' || datatype_vvvvwbf == 'DATE' || datatype_vvvvwbf == 'TIME' || datatype_vvvvwbf == 'INT' || datatype_vvvvwbf == 'TINYINT' || datatype_vvvvwbf == 'BIGINT' || datatype_vvvvwbf == 'FLOAT' || datatype_vvvvwbf == 'DECIMAL' || datatype_vvvvwbf == 'DOUBLE')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbf Some function
-function has_defaults_vvvvwbf_SomeFunc(has_defaults_vvvvwbf)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbf == 1)
+	if (has_defaults_vvvvwbe == 1)
 	{
 		return true;
 	}
@@ -301,20 +218,8 @@ function has_defaults_vvvvwbf_SomeFunc(has_defaults_vvvvwbf)
 }
 
 // the vvvvwbg function
-function vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg)
+function vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg)
 {
-	if (isSet(has_defaults_vvvvwbg) && has_defaults_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = has_defaults_vvvvwbg;
-		var has_defaults_vvvvwbg = [];
-		has_defaults_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(has_defaults_vvvvwbg))
-	{
-		var has_defaults_vvvvwbg = [];
-	}
-	var has_defaults = has_defaults_vvvvwbg.some(has_defaults_vvvvwbg_SomeFunc);
-
 	if (isSet(datatype_vvvvwbg) && datatype_vvvvwbg.constructor !== Array)
 	{
 		var temp_vvvvwbg = datatype_vvvvwbg;
@@ -327,9 +232,21 @@ function vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg)
 	}
 	var datatype = datatype_vvvvwbg.some(datatype_vvvvwbg_SomeFunc);
 
+	if (isSet(has_defaults_vvvvwbg) && has_defaults_vvvvwbg.constructor !== Array)
+	{
+		var temp_vvvvwbg = has_defaults_vvvvwbg;
+		var has_defaults_vvvvwbg = [];
+		has_defaults_vvvvwbg.push(temp_vvvvwbg);
+	}
+	else if (!isSet(has_defaults_vvvvwbg))
+	{
+		var has_defaults_vvvvwbg = [];
+	}
+	var has_defaults = has_defaults_vvvvwbg.some(has_defaults_vvvvwbg_SomeFunc);
+
 
 	// set this function logic
-	if (has_defaults && datatype)
+	if (datatype && has_defaults)
 	{
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
@@ -361,17 +278,6 @@ function vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg)
 	}
 }
 
-// the vvvvwbg Some function
-function has_defaults_vvvvwbg_SomeFunc(has_defaults_vvvvwbg)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbg == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbg Some function
 function datatype_vvvvwbg_SomeFunc(datatype_vvvvwbg)
 {
@@ -383,21 +289,20 @@ function datatype_vvvvwbg_SomeFunc(datatype_vvvvwbg)
 	return false;
 }
 
-// the vvvvwbh function
-function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh)
+// the vvvvwbg Some function
+function has_defaults_vvvvwbg_SomeFunc(has_defaults_vvvvwbg)
 {
-	if (isSet(datatype_vvvvwbh) && datatype_vvvvwbh.constructor !== Array)
+	// set the function logic
+	if (has_defaults_vvvvwbg == 1)
 	{
-		var temp_vvvvwbh = datatype_vvvvwbh;
-		var datatype_vvvvwbh = [];
-		datatype_vvvvwbh.push(temp_vvvvwbh);
+		return true;
 	}
-	else if (!isSet(datatype_vvvvwbh))
-	{
-		var datatype_vvvvwbh = [];
-	}
-	var datatype = datatype_vvvvwbh.some(datatype_vvvvwbh_SomeFunc);
+	return false;
+}
 
+// the vvvvwbh function
+function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
+{
 	if (isSet(has_defaults_vvvvwbh) && has_defaults_vvvvwbh.constructor !== Array)
 	{
 		var temp_vvvvwbh = has_defaults_vvvvwbh;
@@ -410,47 +315,52 @@ function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh)
 	}
 	var has_defaults = has_defaults_vvvvwbh.some(has_defaults_vvvvwbh_SomeFunc);
 
+	if (isSet(datatype_vvvvwbh) && datatype_vvvvwbh.constructor !== Array)
+	{
+		var temp_vvvvwbh = datatype_vvvvwbh;
+		var datatype_vvvvwbh = [];
+		datatype_vvvvwbh.push(temp_vvvvwbh);
+	}
+	else if (!isSet(datatype_vvvvwbh))
+	{
+		var datatype_vvvvwbh = [];
+	}
+	var datatype = datatype_vvvvwbh.some(datatype_vvvvwbh_SomeFunc);
+
 
 	// set this function logic
-	if (datatype && has_defaults)
+	if (has_defaults && datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
 		if (jform_vvvvwbhwam_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwbhwam_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
 		if (!jform_vvvvwbhwam_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwbhwam_required = true;
 		}
 	}
 }
 
-// the vvvvwbh Some function
-function datatype_vvvvwbh_SomeFunc(datatype_vvvvwbh)
-{
-	// set the function logic
-	if (datatype_vvvvwbh == 'CHAR' || datatype_vvvvwbh == 'VARCHAR' || datatype_vvvvwbh == 'TEXT' || datatype_vvvvwbh == 'MEDIUMTEXT' || datatype_vvvvwbh == 'LONGTEXT' || datatype_vvvvwbh == 'BLOB' || datatype_vvvvwbh == 'TINYBLOB' || datatype_vvvvwbh == 'MEDIUMBLOB' || datatype_vvvvwbh == 'LONGBLOB')
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbh Some function
 function has_defaults_vvvvwbh_SomeFunc(has_defaults_vvvvwbh)
 {
@@ -462,84 +372,90 @@ function has_defaults_vvvvwbh_SomeFunc(has_defaults_vvvvwbh)
 	return false;
 }
 
-// the vvvvwbj function
-function vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj)
+// the vvvvwbh Some function
+function datatype_vvvvwbh_SomeFunc(datatype_vvvvwbh)
 {
-	if (isSet(store_vvvvwbj) && store_vvvvwbj.constructor !== Array)
+	// set the function logic
+	if (datatype_vvvvwbh == 'CHAR' || datatype_vvvvwbh == 'VARCHAR' || datatype_vvvvwbh == 'DATETIME' || datatype_vvvvwbh == 'DATE' || datatype_vvvvwbh == 'TIME' || datatype_vvvvwbh == 'INT' || datatype_vvvvwbh == 'TINYINT' || datatype_vvvvwbh == 'BIGINT' || datatype_vvvvwbh == 'FLOAT' || datatype_vvvvwbh == 'DECIMAL' || datatype_vvvvwbh == 'DOUBLE')
 	{
-		var temp_vvvvwbj = store_vvvvwbj;
-		var store_vvvvwbj = [];
-		store_vvvvwbj.push(temp_vvvvwbj);
+		return true;
 	}
-	else if (!isSet(store_vvvvwbj))
-	{
-		var store_vvvvwbj = [];
-	}
-	var store = store_vvvvwbj.some(store_vvvvwbj_SomeFunc);
+	return false;
+}
 
-	if (isSet(datatype_vvvvwbj) && datatype_vvvvwbj.constructor !== Array)
+// the vvvvwbi function
+function vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi)
+{
+	if (isSet(datatype_vvvvwbi) && datatype_vvvvwbi.constructor !== Array)
 	{
-		var temp_vvvvwbj = datatype_vvvvwbj;
-		var datatype_vvvvwbj = [];
-		datatype_vvvvwbj.push(temp_vvvvwbj);
+		var temp_vvvvwbi = datatype_vvvvwbi;
+		var datatype_vvvvwbi = [];
+		datatype_vvvvwbi.push(temp_vvvvwbi);
 	}
-	else if (!isSet(datatype_vvvvwbj))
+	else if (!isSet(datatype_vvvvwbi))
 	{
-		var datatype_vvvvwbj = [];
+		var datatype_vvvvwbi = [];
 	}
-	var datatype = datatype_vvvvwbj.some(datatype_vvvvwbj_SomeFunc);
+	var datatype = datatype_vvvvwbi.some(datatype_vvvvwbi_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbj) && has_defaults_vvvvwbj.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbi) && has_defaults_vvvvwbi.constructor !== Array)
 	{
-		var temp_vvvvwbj = has_defaults_vvvvwbj;
-		var has_defaults_vvvvwbj = [];
-		has_defaults_vvvvwbj.push(temp_vvvvwbj);
+		var temp_vvvvwbi = has_defaults_vvvvwbi;
+		var has_defaults_vvvvwbi = [];
+		has_defaults_vvvvwbi.push(temp_vvvvwbi);
 	}
-	else if (!isSet(has_defaults_vvvvwbj))
+	else if (!isSet(has_defaults_vvvvwbi))
 	{
-		var has_defaults_vvvvwbj = [];
+		var has_defaults_vvvvwbi = [];
 	}
-	var has_defaults = has_defaults_vvvvwbj.some(has_defaults_vvvvwbj_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbi.some(has_defaults_vvvvwbi_SomeFunc);
 
 
 	// set this function logic
-	if (store && datatype && has_defaults)
+	if (datatype && has_defaults)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwbiwan_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwbiwan_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		// remove required attribute from store field
+		if (!jform_vvvvwbiwan_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwbiwan_required = true;
+		}
 	}
 }
 
-// the vvvvwbj Some function
-function store_vvvvwbj_SomeFunc(store_vvvvwbj)
+// the vvvvwbi Some function
+function datatype_vvvvwbi_SomeFunc(datatype_vvvvwbi)
 {
 	// set the function logic
-	if (store_vvvvwbj == 4)
+	if (datatype_vvvvwbi == 'CHAR' || datatype_vvvvwbi == 'VARCHAR' || datatype_vvvvwbi == 'TEXT' || datatype_vvvvwbi == 'MEDIUMTEXT' || datatype_vvvvwbi == 'LONGTEXT' || datatype_vvvvwbi == 'BLOB' || datatype_vvvvwbi == 'TINYBLOB' || datatype_vvvvwbi == 'MEDIUMBLOB' || datatype_vvvvwbi == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbj Some function
-function datatype_vvvvwbj_SomeFunc(datatype_vvvvwbj)
+// the vvvvwbi Some function
+function has_defaults_vvvvwbi_SomeFunc(has_defaults_vvvvwbi)
 {
 	// set the function logic
-	if (datatype_vvvvwbj == 'CHAR' || datatype_vvvvwbj == 'VARCHAR' || datatype_vvvvwbj == 'TEXT' || datatype_vvvvwbj == 'MEDIUMTEXT' || datatype_vvvvwbj == 'LONGTEXT' || datatype_vvvvwbj == 'BLOB' || datatype_vvvvwbj == 'TINYBLOB' || datatype_vvvvwbj == 'MEDIUMBLOB' || datatype_vvvvwbj == 'LONGBLOB')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbj Some function
-function has_defaults_vvvvwbj_SomeFunc(has_defaults_vvvvwbj)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbj == 1)
+	if (has_defaults_vvvvwbi == 1)
 	{
 		return true;
 	}
@@ -547,20 +463,8 @@ function has_defaults_vvvvwbj_SomeFunc(has_defaults_vvvvwbj)
 }
 
 // the vvvvwbk function
-function vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk)
+function vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk)
 {
-	if (isSet(datatype_vvvvwbk) && datatype_vvvvwbk.constructor !== Array)
-	{
-		var temp_vvvvwbk = datatype_vvvvwbk;
-		var datatype_vvvvwbk = [];
-		datatype_vvvvwbk.push(temp_vvvvwbk);
-	}
-	else if (!isSet(datatype_vvvvwbk))
-	{
-		var datatype_vvvvwbk = [];
-	}
-	var datatype = datatype_vvvvwbk.some(datatype_vvvvwbk_SomeFunc);
-
 	if (isSet(store_vvvvwbk) && store_vvvvwbk.constructor !== Array)
 	{
 		var temp_vvvvwbk = store_vvvvwbk;
@@ -573,6 +477,18 @@ function vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk)
 	}
 	var store = store_vvvvwbk.some(store_vvvvwbk_SomeFunc);
 
+	if (isSet(datatype_vvvvwbk) && datatype_vvvvwbk.constructor !== Array)
+	{
+		var temp_vvvvwbk = datatype_vvvvwbk;
+		var datatype_vvvvwbk = [];
+		datatype_vvvvwbk.push(temp_vvvvwbk);
+	}
+	else if (!isSet(datatype_vvvvwbk))
+	{
+		var datatype_vvvvwbk = [];
+	}
+	var datatype = datatype_vvvvwbk.some(datatype_vvvvwbk_SomeFunc);
+
 	if (isSet(has_defaults_vvvvwbk) && has_defaults_vvvvwbk.constructor !== Array)
 	{
 		var temp_vvvvwbk = has_defaults_vvvvwbk;
@@ -587,7 +503,7 @@ function vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk)
 
 
 	// set this function logic
-	if (datatype && store && has_defaults)
+	if (store && datatype && has_defaults)
 	{
 		jQuery('.note_whmcs_encryption').closest('.control-group').show();
 	}
@@ -598,10 +514,10 @@ function vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk)
 }
 
 // the vvvvwbk Some function
-function datatype_vvvvwbk_SomeFunc(datatype_vvvvwbk)
+function store_vvvvwbk_SomeFunc(store_vvvvwbk)
 {
 	// set the function logic
-	if (datatype_vvvvwbk == 'CHAR' || datatype_vvvvwbk == 'VARCHAR' || datatype_vvvvwbk == 'TEXT' || datatype_vvvvwbk == 'MEDIUMTEXT' || datatype_vvvvwbk == 'LONGTEXT' || datatype_vvvvwbk == 'BLOB' || datatype_vvvvwbk == 'TINYBLOB' || datatype_vvvvwbk == 'MEDIUMBLOB' || datatype_vvvvwbk == 'LONGBLOB')
+	if (store_vvvvwbk == 4)
 	{
 		return true;
 	}
@@ -609,10 +525,10 @@ function datatype_vvvvwbk_SomeFunc(datatype_vvvvwbk)
 }
 
 // the vvvvwbk Some function
-function store_vvvvwbk_SomeFunc(store_vvvvwbk)
+function datatype_vvvvwbk_SomeFunc(datatype_vvvvwbk)
 {
 	// set the function logic
-	if (store_vvvvwbk == 4)
+	if (datatype_vvvvwbk == 'CHAR' || datatype_vvvvwbk == 'VARCHAR' || datatype_vvvvwbk == 'TEXT' || datatype_vvvvwbk == 'MEDIUMTEXT' || datatype_vvvvwbk == 'LONGTEXT' || datatype_vvvvwbk == 'BLOB' || datatype_vvvvwbk == 'TINYBLOB' || datatype_vvvvwbk == 'MEDIUMBLOB' || datatype_vvvvwbk == 'LONGBLOB')
 	{
 		return true;
 	}
@@ -631,19 +547,19 @@ function has_defaults_vvvvwbk_SomeFunc(has_defaults_vvvvwbk)
 }
 
 // the vvvvwbl function
-function vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl)
+function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 {
-	if (isSet(has_defaults_vvvvwbl) && has_defaults_vvvvwbl.constructor !== Array)
+	if (isSet(datatype_vvvvwbl) && datatype_vvvvwbl.constructor !== Array)
 	{
-		var temp_vvvvwbl = has_defaults_vvvvwbl;
-		var has_defaults_vvvvwbl = [];
-		has_defaults_vvvvwbl.push(temp_vvvvwbl);
+		var temp_vvvvwbl = datatype_vvvvwbl;
+		var datatype_vvvvwbl = [];
+		datatype_vvvvwbl.push(temp_vvvvwbl);
 	}
-	else if (!isSet(has_defaults_vvvvwbl))
+	else if (!isSet(datatype_vvvvwbl))
 	{
-		var has_defaults_vvvvwbl = [];
+		var datatype_vvvvwbl = [];
 	}
-	var has_defaults = has_defaults_vvvvwbl.some(has_defaults_vvvvwbl_SomeFunc);
+	var datatype = datatype_vvvvwbl.some(datatype_vvvvwbl_SomeFunc);
 
 	if (isSet(store_vvvvwbl) && store_vvvvwbl.constructor !== Array)
 	{
@@ -657,21 +573,21 @@ function vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl)
 	}
 	var store = store_vvvvwbl.some(store_vvvvwbl_SomeFunc);
 
-	if (isSet(datatype_vvvvwbl) && datatype_vvvvwbl.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbl) && has_defaults_vvvvwbl.constructor !== Array)
 	{
-		var temp_vvvvwbl = datatype_vvvvwbl;
-		var datatype_vvvvwbl = [];
-		datatype_vvvvwbl.push(temp_vvvvwbl);
+		var temp_vvvvwbl = has_defaults_vvvvwbl;
+		var has_defaults_vvvvwbl = [];
+		has_defaults_vvvvwbl.push(temp_vvvvwbl);
 	}
-	else if (!isSet(datatype_vvvvwbl))
+	else if (!isSet(has_defaults_vvvvwbl))
 	{
-		var datatype_vvvvwbl = [];
+		var has_defaults_vvvvwbl = [];
 	}
-	var datatype = datatype_vvvvwbl.some(datatype_vvvvwbl_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbl.some(has_defaults_vvvvwbl_SomeFunc);
 
 
 	// set this function logic
-	if (has_defaults && store && datatype)
+	if (datatype && store && has_defaults)
 	{
 		jQuery('.note_whmcs_encryption').closest('.control-group').show();
 	}
@@ -682,10 +598,10 @@ function vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl)
 }
 
 // the vvvvwbl Some function
-function has_defaults_vvvvwbl_SomeFunc(has_defaults_vvvvwbl)
+function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbl == 1)
+	if (datatype_vvvvwbl == 'CHAR' || datatype_vvvvwbl == 'VARCHAR' || datatype_vvvvwbl == 'TEXT' || datatype_vvvvwbl == 'MEDIUMTEXT' || datatype_vvvvwbl == 'LONGTEXT' || datatype_vvvvwbl == 'BLOB' || datatype_vvvvwbl == 'TINYBLOB' || datatype_vvvvwbl == 'MEDIUMBLOB' || datatype_vvvvwbl == 'LONGBLOB')
 	{
 		return true;
 	}
@@ -704,10 +620,10 @@ function store_vvvvwbl_SomeFunc(store_vvvvwbl)
 }
 
 // the vvvvwbl Some function
-function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
+function has_defaults_vvvvwbl_SomeFunc(has_defaults_vvvvwbl)
 {
 	// set the function logic
-	if (datatype_vvvvwbl == 'CHAR' || datatype_vvvvwbl == 'VARCHAR' || datatype_vvvvwbl == 'TEXT' || datatype_vvvvwbl == 'MEDIUMTEXT' || datatype_vvvvwbl == 'LONGTEXT' || datatype_vvvvwbl == 'BLOB' || datatype_vvvvwbl == 'TINYBLOB' || datatype_vvvvwbl == 'MEDIUMBLOB' || datatype_vvvvwbl == 'LONGBLOB')
+	if (has_defaults_vvvvwbl == 1)
 	{
 		return true;
 	}
@@ -715,53 +631,137 @@ function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
 }
 
 // the vvvvwbm function
-function vvvvwbm(has_defaults_vvvvwbm)
+function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
+{
+	if (isSet(has_defaults_vvvvwbm) && has_defaults_vvvvwbm.constructor !== Array)
+	{
+		var temp_vvvvwbm = has_defaults_vvvvwbm;
+		var has_defaults_vvvvwbm = [];
+		has_defaults_vvvvwbm.push(temp_vvvvwbm);
+	}
+	else if (!isSet(has_defaults_vvvvwbm))
+	{
+		var has_defaults_vvvvwbm = [];
+	}
+	var has_defaults = has_defaults_vvvvwbm.some(has_defaults_vvvvwbm_SomeFunc);
+
+	if (isSet(store_vvvvwbm) && store_vvvvwbm.constructor !== Array)
+	{
+		var temp_vvvvwbm = store_vvvvwbm;
+		var store_vvvvwbm = [];
+		store_vvvvwbm.push(temp_vvvvwbm);
+	}
+	else if (!isSet(store_vvvvwbm))
+	{
+		var store_vvvvwbm = [];
+	}
+	var store = store_vvvvwbm.some(store_vvvvwbm_SomeFunc);
+
+	if (isSet(datatype_vvvvwbm) && datatype_vvvvwbm.constructor !== Array)
+	{
+		var temp_vvvvwbm = datatype_vvvvwbm;
+		var datatype_vvvvwbm = [];
+		datatype_vvvvwbm.push(temp_vvvvwbm);
+	}
+	else if (!isSet(datatype_vvvvwbm))
+	{
+		var datatype_vvvvwbm = [];
+	}
+	var datatype = datatype_vvvvwbm.some(datatype_vvvvwbm_SomeFunc);
+
+
+	// set this function logic
+	if (has_defaults && store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbm Some function
+function has_defaults_vvvvwbm_SomeFunc(has_defaults_vvvvwbm)
 {
 	// set the function logic
 	if (has_defaults_vvvvwbm == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbm Some function
+function store_vvvvwbm_SomeFunc(store_vvvvwbm)
+{
+	// set the function logic
+	if (store_vvvvwbm == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbm Some function
+function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
+{
+	// set the function logic
+	if (datatype_vvvvwbm == 'CHAR' || datatype_vvvvwbm == 'VARCHAR' || datatype_vvvvwbm == 'TEXT' || datatype_vvvvwbm == 'MEDIUMTEXT' || datatype_vvvvwbm == 'LONGTEXT' || datatype_vvvvwbm == 'BLOB' || datatype_vvvvwbm == 'TINYBLOB' || datatype_vvvvwbm == 'MEDIUMBLOB' || datatype_vvvvwbm == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbn function
+function vvvvwbn(has_defaults_vvvvwbn)
+{
+	// set the function logic
+	if (has_defaults_vvvvwbn == 1)
 	{
 		jQuery('#jform_datatype').closest('.control-group').show();
 		// add required attribute to datatype field
-		if (jform_vvvvwbmwan_required)
+		if (jform_vvvvwbnwao_required)
 		{
 			updateFieldRequired('datatype',0);
 			jQuery('#jform_datatype').prop('required','required');
 			jQuery('#jform_datatype').attr('aria-required',true);
 			jQuery('#jform_datatype').addClass('required');
-			jform_vvvvwbmwan_required = false;
+			jform_vvvvwbnwao_required = false;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').show();
 		// add required attribute to null_switch field
-		if (jform_vvvvwbmwao_required)
+		if (jform_vvvvwbnwap_required)
 		{
 			updateFieldRequired('null_switch',0);
 			jQuery('#jform_null_switch').prop('required','required');
 			jQuery('#jform_null_switch').attr('aria-required',true);
 			jQuery('#jform_null_switch').addClass('required');
-			jform_vvvvwbmwao_required = false;
+			jform_vvvvwbnwap_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datatype').closest('.control-group').hide();
 		// remove required attribute from datatype field
-		if (!jform_vvvvwbmwan_required)
+		if (!jform_vvvvwbnwao_required)
 		{
 			updateFieldRequired('datatype',1);
 			jQuery('#jform_datatype').removeAttr('required');
 			jQuery('#jform_datatype').removeAttr('aria-required');
 			jQuery('#jform_datatype').removeClass('required');
-			jform_vvvvwbmwan_required = true;
+			jform_vvvvwbnwao_required = true;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').hide();
 		// remove required attribute from null_switch field
-		if (!jform_vvvvwbmwao_required)
+		if (!jform_vvvvwbnwap_required)
 		{
 			updateFieldRequired('null_switch',1);
 			jQuery('#jform_null_switch').removeAttr('required');
 			jQuery('#jform_null_switch').removeAttr('aria-required');
 			jQuery('#jform_null_switch').removeClass('required');
-			jform_vvvvwbmwao_required = true;
+			jform_vvvvwbnwap_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 00eb01004..672417450 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -9,24 +9,21 @@
  */
 
 // Some Global Values
-jform_vvvvwbxwba_required = false;
 jform_vvvvwbywbb_required = false;
 jform_vvvvwbzwbc_required = false;
 jform_vvvvwcawbd_required = false;
 jform_vvvvwcbwbe_required = false;
 jform_vvvvwccwbf_required = false;
+jform_vvvvwcdwbg_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwbx = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbx(location_vvvvwbx);
-
 	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwby(location_vvvvwby);
 
-	var type_vvvvwbz = jQuery("#jform_type").val();
-	vvvvwbz(type_vvvvwbz);
+	var location_vvvvwbz = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbz(location_vvvvwbz);
 
 	var type_vvvvwca = jQuery("#jform_type").val();
 	vvvvwca(type_vvvvwca);
@@ -34,130 +31,77 @@ jQuery(document).ready(function()
 	var type_vvvvwcb = jQuery("#jform_type").val();
 	vvvvwcb(type_vvvvwcb);
 
-	var target_vvvvwcc = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcc(target_vvvvwcc);
+	var type_vvvvwcc = jQuery("#jform_type").val();
+	vvvvwcc(type_vvvvwcc);
+
+	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcd(target_vvvvwcd);
 });
 
-// the vvvvwbx function
-function vvvvwbx(location_vvvvwbx)
+// the vvvvwby function
+function vvvvwby(location_vvvvwby)
 {
 	// set the function logic
-	if (location_vvvvwbx == 1)
+	if (location_vvvvwby == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwbxwba_required)
+		if (jform_vvvvwbywbb_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwbxwba_required = false;
+			jform_vvvvwbywbb_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwbxwba_required)
+		if (!jform_vvvvwbywbb_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwbxwba_required = true;
-		}
-	}
-}
-
-// the vvvvwby function
-function vvvvwby(location_vvvvwby)
-{
-	// set the function logic
-	if (location_vvvvwby == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		// add required attribute to site_view field
-		if (jform_vvvvwbywbb_required)
-		{
-			updateFieldRequired('site_view',0);
-			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwbywbb_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		// remove required attribute from site_view field
-		if (!jform_vvvvwbywbb_required)
-		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwbywbb_required = true;
 		}
 	}
 }
 
 // the vvvvwbz function
-function vvvvwbz(type_vvvvwbz)
+function vvvvwbz(location_vvvvwbz)
 {
-	if (isSet(type_vvvvwbz) && type_vvvvwbz.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwbz == 2)
 	{
-		var temp_vvvvwbz = type_vvvvwbz;
-		var type_vvvvwbz = [];
-		type_vvvvwbz.push(temp_vvvvwbz);
-	}
-	else if (!isSet(type_vvvvwbz))
-	{
-		var type_vvvvwbz = [];
-	}
-	var type = type_vvvvwbz.some(type_vvvvwbz_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		// add required attribute to url field
+		jQuery('#jform_site_view').closest('.control-group').show();
+		// add required attribute to site_view field
 		if (jform_vvvvwbzwbc_required)
 		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
+			updateFieldRequired('site_view',0);
+			jQuery('#jform_site_view').prop('required','required');
+			jQuery('#jform_site_view').attr('aria-required',true);
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwbzwbc_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		// remove required attribute from url field
+		jQuery('#jform_site_view').closest('.control-group').hide();
+		// remove required attribute from site_view field
 		if (!jform_vvvvwbzwbc_required)
 		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
+			updateFieldRequired('site_view',1);
+			jQuery('#jform_site_view').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwbzwbc_required = true;
 		}
 	}
 }
 
-// the vvvvwbz Some function
-function type_vvvvwbz_SomeFunc(type_vvvvwbz)
-{
-	// set the function logic
-	if (type_vvvvwbz == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwca function
 function vvvvwca(type_vvvvwca)
 {
@@ -177,27 +121,27 @@ function vvvvwca(type_vvvvwca)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
-		// add required attribute to article field
+		jQuery('#jform_url').closest('.control-group').show();
+		// add required attribute to url field
 		if (jform_vvvvwcawbd_required)
 		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			updateFieldRequired('url',0);
+			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwcawbd_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
-		// remove required attribute from article field
+		jQuery('#jform_url').closest('.control-group').hide();
+		// remove required attribute from url field
 		if (!jform_vvvvwcawbd_required)
 		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			updateFieldRequired('url',1);
+			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwcawbd_required = true;
 		}
 	}
@@ -207,7 +151,7 @@ function vvvvwca(type_vvvvwca)
 function type_vvvvwca_SomeFunc(type_vvvvwca)
 {
 	// set the function logic
-	if (type_vvvvwca == 1)
+	if (type_vvvvwca == 3)
 	{
 		return true;
 	}
@@ -233,27 +177,27 @@ function vvvvwcb(type_vvvvwcb)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
-		// add required attribute to content field
+		jQuery('#jform_article').closest('.control-group').show();
+		// add required attribute to article field
 		if (jform_vvvvwcbwbe_required)
 		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwcbwbe_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		// remove required attribute from content field
+		jQuery('#jform_article').closest('.control-group').hide();
+		// remove required attribute from article field
 		if (!jform_vvvvwcbwbe_required)
 		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
 			jform_vvvvwcbwbe_required = true;
 		}
 	}
@@ -263,7 +207,7 @@ function vvvvwcb(type_vvvvwcb)
 function type_vvvvwcb_SomeFunc(type_vvvvwcb)
 {
 	// set the function logic
-	if (type_vvvvwcb == 2)
+	if (type_vvvvwcb == 1)
 	{
 		return true;
 	}
@@ -271,33 +215,89 @@ function type_vvvvwcb_SomeFunc(type_vvvvwcb)
 }
 
 // the vvvvwcc function
-function vvvvwcc(target_vvvvwcc)
+function vvvvwcc(type_vvvvwcc)
+{
+	if (isSet(type_vvvvwcc) && type_vvvvwcc.constructor !== Array)
+	{
+		var temp_vvvvwcc = type_vvvvwcc;
+		var type_vvvvwcc = [];
+		type_vvvvwcc.push(temp_vvvvwcc);
+	}
+	else if (!isSet(type_vvvvwcc))
+	{
+		var type_vvvvwcc = [];
+	}
+	var type = type_vvvvwcc.some(type_vvvvwcc_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		// add required attribute to content field
+		if (jform_vvvvwccwbf_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwccwbf_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		// remove required attribute from content field
+		if (!jform_vvvvwccwbf_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwccwbf_required = true;
+		}
+	}
+}
+
+// the vvvvwcc Some function
+function type_vvvvwcc_SomeFunc(type_vvvvwcc)
 {
 	// set the function logic
-	if (target_vvvvwcc == 1)
+	if (type_vvvvwcc == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcd function
+function vvvvwcd(target_vvvvwcd)
+{
+	// set the function logic
+	if (target_vvvvwcd == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwccwbf_required)
+		if (jform_vvvvwcdwbg_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwccwbf_required = false;
+			jform_vvvvwcdwbg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwccwbf_required)
+		if (!jform_vvvvwcdwbg_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwccwbf_required = true;
+			jform_vvvvwcdwbg_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js
index 96f1224c5..975a7b8e6 100644
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvvzdvyz_required = false;
+jform_vvvvvzevza_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvze(add_php_view_vvvvvze);
 });
 
-// the vvvvvzd function
-function vvvvvzd(add_php_view_vvvvvzd)
+// the vvvvvze function
+function vvvvvze(add_php_view_vvvvvze)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzd == 1)
+	if (add_php_view_vvvvvze == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvzdvyz_required)
+		if (jform_vvvvvzevza_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzdvyz_required = false;
+			jform_vvvvvzevza_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvzdvyz_required)
+		if (!jform_vvvvvzevza_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzdvyz_required = true;
+			jform_vvvvvzevza_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js
index c4bd265e8..7db2d61b9 100644
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@@ -9,15 +9,12 @@
  */
 
 // Some Global Values
-jform_vvvvwakvzy_required = false;
-jform_vvvvwaqvzz_required = false;
+jform_vvvvwalvzz_required = false;
+jform_vvvvwarwaa_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwaj = jQuery("#jform_how").val();
-	vvvvwaj(how_vvvvwaj);
-
 	var how_vvvvwak = jQuery("#jform_how").val();
 	vvvvwak(how_vvvvwak);
 
@@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwap = jQuery("#jform_how").val();
 	vvvvwap(how_vvvvwap);
 
-	var type_vvvvwaq = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaq(type_vvvvwaq);
+	var how_vvvvwaq = jQuery("#jform_how").val();
+	vvvvwaq(how_vvvvwaq);
+
+	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwar(type_vvvvwar);
 });
 
-// the vvvvwaj function
-function vvvvwaj(how_vvvvwaj)
-{
-	if (isSet(how_vvvvwaj) && how_vvvvwaj.constructor !== Array)
-	{
-		var temp_vvvvwaj = how_vvvvwaj;
-		var how_vvvvwaj = [];
-		how_vvvvwaj.push(temp_vvvvwaj);
-	}
-	else if (!isSet(how_vvvvwaj))
-	{
-		var how_vvvvwaj = [];
-	}
-	var how = how_vvvvwaj.some(how_vvvvwaj_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwaj Some function
-function how_vvvvwaj_SomeFunc(how_vvvvwaj)
-{
-	// set the function logic
-	if (how_vvvvwaj == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwak function
 function vvvvwak(how_vvvvwak)
 {
@@ -97,29 +59,11 @@ function vvvvwak(how_vvvvwak)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		// add required attribute to php_setdocument field
-		if (jform_vvvvwakvzy_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwakvzy_required = false;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwakvzy_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwakvzy_required = true;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -127,7 +71,7 @@ function vvvvwak(how_vvvvwak)
 function how_vvvvwak_SomeFunc(how_vvvvwak)
 {
 	// set the function logic
-	if (how_vvvvwak == 3)
+	if (how_vvvvwak == 2)
 	{
 		return true;
 	}
@@ -153,11 +97,29 @@ function vvvvwal(how_vvvvwal)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		// add required attribute to php_setdocument field
+		if (jform_vvvvwalvzz_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwalvzz_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		// remove required attribute from php_setdocument field
+		if (!jform_vvvvwalvzz_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwalvzz_required = true;
+		}
 	}
 }
 
@@ -165,7 +127,7 @@ function vvvvwal(how_vvvvwal)
 function how_vvvvwal_SomeFunc(how_vvvvwal)
 {
 	// set the function logic
-	if (how_vvvvwal == 2 || how_vvvvwal == 3)
+	if (how_vvvvwal == 3)
 	{
 		return true;
 	}
@@ -191,11 +153,11 @@ function vvvvwam(how_vvvvwam)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -203,7 +165,7 @@ function vvvvwam(how_vvvvwam)
 function how_vvvvwam_SomeFunc(how_vvvvwam)
 {
 	// set the function logic
-	if (how_vvvvwam == 1 || how_vvvvwam == 2 || how_vvvvwam == 3)
+	if (how_vvvvwam == 2 || how_vvvvwam == 3)
 	{
 		return true;
 	}
@@ -229,15 +191,11 @@ function vvvvwan(how_vvvvwan)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
 	}
 }
 
@@ -245,7 +203,7 @@ function vvvvwan(how_vvvvwan)
 function how_vvvvwan_SomeFunc(how_vvvvwan)
 {
 	// set the function logic
-	if (how_vvvvwan == 0)
+	if (how_vvvvwan == 1 || how_vvvvwan == 2 || how_vvvvwan == 3)
 	{
 		return true;
 	}
@@ -271,13 +229,15 @@ function vvvvwao(how_vvvvwao)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -285,7 +245,7 @@ function vvvvwao(how_vvvvwao)
 function how_vvvvwao_SomeFunc(how_vvvvwao)
 {
 	// set the function logic
-	if (how_vvvvwao == 1)
+	if (how_vvvvwao == 0)
 	{
 		return true;
 	}
@@ -308,6 +268,46 @@ function vvvvwap(how_vvvvwap)
 	var how = how_vvvvwap.some(how_vvvvwap_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwap Some function
+function how_vvvvwap_SomeFunc(how_vvvvwap)
+{
+	// set the function logic
+	if (how_vvvvwap == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaq function
+function vvvvwaq(how_vvvvwaq)
+{
+	if (isSet(how_vvvvwaq) && how_vvvvwaq.constructor !== Array)
+	{
+		var temp_vvvvwaq = how_vvvvwaq;
+		var how_vvvvwaq = [];
+		how_vvvvwaq.push(temp_vvvvwaq);
+	}
+	else if (!isSet(how_vvvvwaq))
+	{
+		var how_vvvvwaq = [];
+	}
+	var how = how_vvvvwaq.some(how_vvvvwaq_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -323,45 +323,45 @@ function vvvvwap(how_vvvvwap)
 	}
 }
 
-// the vvvvwap Some function
-function how_vvvvwap_SomeFunc(how_vvvvwap)
+// the vvvvwaq Some function
+function how_vvvvwaq_SomeFunc(how_vvvvwaq)
 {
 	// set the function logic
-	if (how_vvvvwap == 4)
+	if (how_vvvvwaq == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwaq function
-function vvvvwaq(type_vvvvwaq)
+// the vvvvwar function
+function vvvvwar(type_vvvvwar)
 {
 	// set the function logic
-	if (type_vvvvwaq == 2)
+	if (type_vvvvwar == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwaqvzz_required)
+		if (jform_vvvvwarwaa_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwaqvzz_required = false;
+			jform_vvvvwarwaa_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwaqvzz_required)
+		if (!jform_vvvvwarwaa_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwaqvzz_required = true;
+			jform_vvvvwarwaa_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/server.js b/admin/models/forms/server.js
index 37b400b83..7472c9662 100644
--- a/admin/models/forms/server.js
+++ b/admin/models/forms/server.js
@@ -9,180 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvwbnwaq_required = false;
-jform_vvvvwbnwar_required = false;
-jform_vvvvwbnwas_required = false;
-jform_vvvvwbnwat_required = false;
-jform_vvvvwbnwau_required = false;
+jform_vvvvwbowar_required = false;
+jform_vvvvwbowas_required = false;
+jform_vvvvwbowat_required = false;
+jform_vvvvwbowau_required = false;
 jform_vvvvwbowav_required = false;
 jform_vvvvwbpwaw_required = false;
-jform_vvvvwbrwax_required = false;
-jform_vvvvwbtway_required = false;
+jform_vvvvwbqwax_required = false;
+jform_vvvvwbsway_required = false;
+jform_vvvvwbuwaz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwbn = jQuery("#jform_protocol").val();
-	vvvvwbn(protocol_vvvvwbn);
-
 	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
 	vvvvwbo(protocol_vvvvwbo);
 
 	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbp = jQuery("#jform_authentication").val();
-	vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp);
+	vvvvwbp(protocol_vvvvwbp);
 
-	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
+	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
-	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
+	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
 
-	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+
+	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
 });
 
-// the vvvvwbn function
-function vvvvwbn(protocol_vvvvwbn)
-{
-	if (isSet(protocol_vvvvwbn) && protocol_vvvvwbn.constructor !== Array)
-	{
-		var temp_vvvvwbn = protocol_vvvvwbn;
-		var protocol_vvvvwbn = [];
-		protocol_vvvvwbn.push(temp_vvvvwbn);
-	}
-	else if (!isSet(protocol_vvvvwbn))
-	{
-		var protocol_vvvvwbn = [];
-	}
-	var protocol = protocol_vvvvwbn.some(protocol_vvvvwbn_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		// add required attribute to authentication field
-		if (jform_vvvvwbnwaq_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwbnwaq_required = false;
-		}
-		jQuery('#jform_host').closest('.control-group').show();
-		// add required attribute to host field
-		if (jform_vvvvwbnwar_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwbnwar_required = false;
-		}
-		jQuery('#jform_port').closest('.control-group').show();
-		// add required attribute to port field
-		if (jform_vvvvwbnwas_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwbnwas_required = false;
-		}
-		jQuery('#jform_path').closest('.control-group').show();
-		// add required attribute to path field
-		if (jform_vvvvwbnwat_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwbnwat_required = false;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		// add required attribute to username field
-		if (jform_vvvvwbnwau_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwbnwau_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		// remove required attribute from authentication field
-		if (!jform_vvvvwbnwaq_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwbnwaq_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		// remove required attribute from host field
-		if (!jform_vvvvwbnwar_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwbnwar_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		// remove required attribute from port field
-		if (!jform_vvvvwbnwas_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwbnwas_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		// remove required attribute from path field
-		if (!jform_vvvvwbnwat_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwbnwat_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		// remove required attribute from username field
-		if (!jform_vvvvwbnwau_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwbnwau_required = true;
-		}
-	}
-}
-
-// the vvvvwbn Some function
-function protocol_vvvvwbn_SomeFunc(protocol_vvvvwbn)
-{
-	// set the function logic
-	if (protocol_vvvvwbn == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbo function
 function vvvvwbo(protocol_vvvvwbo)
 {
@@ -202,29 +64,109 @@ function vvvvwbo(protocol_vvvvwbo)
 	// set this function logic
 	if (protocol)
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
-		// add required attribute to signature field
+		jQuery('#jform_authentication').closest('.control-group').show();
+		// add required attribute to authentication field
+		if (jform_vvvvwbowar_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwbowar_required = false;
+		}
+		jQuery('#jform_host').closest('.control-group').show();
+		// add required attribute to host field
+		if (jform_vvvvwbowas_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwbowas_required = false;
+		}
+		jQuery('#jform_port').closest('.control-group').show();
+		// add required attribute to port field
+		if (jform_vvvvwbowat_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwbowat_required = false;
+		}
+		jQuery('#jform_path').closest('.control-group').show();
+		// add required attribute to path field
+		if (jform_vvvvwbowau_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwbowau_required = false;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
+		// add required attribute to username field
 		if (jform_vvvvwbowav_required)
 		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
 			jform_vvvvwbowav_required = false;
 		}
 	}
 	else
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
-		// remove required attribute from signature field
+		jQuery('#jform_authentication').closest('.control-group').hide();
+		// remove required attribute from authentication field
+		if (!jform_vvvvwbowar_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwbowar_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		// remove required attribute from host field
+		if (!jform_vvvvwbowas_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwbowas_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		// remove required attribute from port field
+		if (!jform_vvvvwbowat_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwbowat_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		// remove required attribute from path field
+		if (!jform_vvvvwbowau_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwbowau_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
+		// remove required attribute from username field
 		if (!jform_vvvvwbowav_required)
 		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
 			jform_vvvvwbowav_required = true;
 		}
 	}
@@ -234,7 +176,7 @@ function vvvvwbo(protocol_vvvvwbo)
 function protocol_vvvvwbo_SomeFunc(protocol_vvvvwbo)
 {
 	// set the function logic
-	if (protocol_vvvvwbo == 1)
+	if (protocol_vvvvwbo == 2)
 	{
 		return true;
 	}
@@ -242,7 +184,7 @@ function protocol_vvvvwbo_SomeFunc(protocol_vvvvwbo)
 }
 
 // the vvvvwbp function
-function vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp)
+function vvvvwbp(protocol_vvvvwbp)
 {
 	if (isSet(protocol_vvvvwbp) && protocol_vvvvwbp.constructor !== Array)
 	{
@@ -256,43 +198,33 @@ function vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp)
 	}
 	var protocol = protocol_vvvvwbp.some(protocol_vvvvwbp_SomeFunc);
 
-	if (isSet(authentication_vvvvwbp) && authentication_vvvvwbp.constructor !== Array)
-	{
-		var temp_vvvvwbp = authentication_vvvvwbp;
-		var authentication_vvvvwbp = [];
-		authentication_vvvvwbp.push(temp_vvvvwbp);
-	}
-	else if (!isSet(authentication_vvvvwbp))
-	{
-		var authentication_vvvvwbp = [];
-	}
-	var authentication = authentication_vvvvwbp.some(authentication_vvvvwbp_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
-		// add required attribute to password field
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
+		// add required attribute to signature field
 		if (jform_vvvvwbpwaw_required)
 		{
-			updateFieldRequired('password',0);
-			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
 			jform_vvvvwbpwaw_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
-		// remove required attribute from password field
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
+		// remove required attribute from signature field
 		if (!jform_vvvvwbpwaw_required)
 		{
-			updateFieldRequired('password',1);
-			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
 			jform_vvvvwbpwaw_required = true;
 		}
 	}
@@ -302,50 +234,118 @@ function vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp)
 function protocol_vvvvwbp_SomeFunc(protocol_vvvvwbp)
 {
 	// set the function logic
-	if (protocol_vvvvwbp == 2)
+	if (protocol_vvvvwbp == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbp Some function
-function authentication_vvvvwbp_SomeFunc(authentication_vvvvwbp)
+// the vvvvwbq function
+function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
+{
+	if (isSet(protocol_vvvvwbq) && protocol_vvvvwbq.constructor !== Array)
+	{
+		var temp_vvvvwbq = protocol_vvvvwbq;
+		var protocol_vvvvwbq = [];
+		protocol_vvvvwbq.push(temp_vvvvwbq);
+	}
+	else if (!isSet(protocol_vvvvwbq))
+	{
+		var protocol_vvvvwbq = [];
+	}
+	var protocol = protocol_vvvvwbq.some(protocol_vvvvwbq_SomeFunc);
+
+	if (isSet(authentication_vvvvwbq) && authentication_vvvvwbq.constructor !== Array)
+	{
+		var temp_vvvvwbq = authentication_vvvvwbq;
+		var authentication_vvvvwbq = [];
+		authentication_vvvvwbq.push(temp_vvvvwbq);
+	}
+	else if (!isSet(authentication_vvvvwbq))
+	{
+		var authentication_vvvvwbq = [];
+	}
+	var authentication = authentication_vvvvwbq.some(authentication_vvvvwbq_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		// add required attribute to password field
+		if (jform_vvvvwbqwax_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwbqwax_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		// remove required attribute from password field
+		if (!jform_vvvvwbqwax_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwbqwax_required = true;
+		}
+	}
+}
+
+// the vvvvwbq Some function
+function protocol_vvvvwbq_SomeFunc(protocol_vvvvwbq)
 {
 	// set the function logic
-	if (authentication_vvvvwbp == 1 || authentication_vvvvwbp == 3 || authentication_vvvvwbp == 5)
+	if (protocol_vvvvwbq == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbr function
-function vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr)
+// the vvvvwbq Some function
+function authentication_vvvvwbq_SomeFunc(authentication_vvvvwbq)
 {
-	if (isSet(protocol_vvvvwbr) && protocol_vvvvwbr.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwbq == 1 || authentication_vvvvwbq == 3 || authentication_vvvvwbq == 5)
 	{
-		var temp_vvvvwbr = protocol_vvvvwbr;
-		var protocol_vvvvwbr = [];
-		protocol_vvvvwbr.push(temp_vvvvwbr);
+		return true;
 	}
-	else if (!isSet(protocol_vvvvwbr))
-	{
-		var protocol_vvvvwbr = [];
-	}
-	var protocol = protocol_vvvvwbr.some(protocol_vvvvwbr_SomeFunc);
+	return false;
+}
 
-	if (isSet(authentication_vvvvwbr) && authentication_vvvvwbr.constructor !== Array)
+// the vvvvwbs function
+function vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs)
+{
+	if (isSet(protocol_vvvvwbs) && protocol_vvvvwbs.constructor !== Array)
 	{
-		var temp_vvvvwbr = authentication_vvvvwbr;
-		var authentication_vvvvwbr = [];
-		authentication_vvvvwbr.push(temp_vvvvwbr);
+		var temp_vvvvwbs = protocol_vvvvwbs;
+		var protocol_vvvvwbs = [];
+		protocol_vvvvwbs.push(temp_vvvvwbs);
 	}
-	else if (!isSet(authentication_vvvvwbr))
+	else if (!isSet(protocol_vvvvwbs))
 	{
-		var authentication_vvvvwbr = [];
+		var protocol_vvvvwbs = [];
 	}
-	var authentication = authentication_vvvvwbr.some(authentication_vvvvwbr_SomeFunc);
+	var protocol = protocol_vvvvwbs.some(protocol_vvvvwbs_SomeFunc);
+
+	if (isSet(authentication_vvvvwbs) && authentication_vvvvwbs.constructor !== Array)
+	{
+		var temp_vvvvwbs = authentication_vvvvwbs;
+		var authentication_vvvvwbs = [];
+		authentication_vvvvwbs.push(temp_vvvvwbs);
+	}
+	else if (!isSet(authentication_vvvvwbs))
+	{
+		var authentication_vvvvwbs = [];
+	}
+	var authentication = authentication_vvvvwbs.some(authentication_vvvvwbs_SomeFunc);
 
 
 	// set this function logic
@@ -353,78 +353,78 @@ function vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwbrwax_required)
+		if (jform_vvvvwbsway_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwbrwax_required = false;
+			jform_vvvvwbsway_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwbrwax_required)
+		if (!jform_vvvvwbsway_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwbrwax_required = true;
+			jform_vvvvwbsway_required = true;
 		}
 	}
 }
 
-// the vvvvwbr Some function
-function protocol_vvvvwbr_SomeFunc(protocol_vvvvwbr)
+// the vvvvwbs Some function
+function protocol_vvvvwbs_SomeFunc(protocol_vvvvwbs)
 {
 	// set the function logic
-	if (protocol_vvvvwbr == 2)
+	if (protocol_vvvvwbs == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbr Some function
-function authentication_vvvvwbr_SomeFunc(authentication_vvvvwbr)
+// the vvvvwbs Some function
+function authentication_vvvvwbs_SomeFunc(authentication_vvvvwbs)
 {
 	// set the function logic
-	if (authentication_vvvvwbr == 2 || authentication_vvvvwbr == 3)
+	if (authentication_vvvvwbs == 2 || authentication_vvvvwbs == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbt function
-function vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt)
+// the vvvvwbu function
+function vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu)
 {
-	if (isSet(protocol_vvvvwbt) && protocol_vvvvwbt.constructor !== Array)
+	if (isSet(protocol_vvvvwbu) && protocol_vvvvwbu.constructor !== Array)
 	{
-		var temp_vvvvwbt = protocol_vvvvwbt;
-		var protocol_vvvvwbt = [];
-		protocol_vvvvwbt.push(temp_vvvvwbt);
+		var temp_vvvvwbu = protocol_vvvvwbu;
+		var protocol_vvvvwbu = [];
+		protocol_vvvvwbu.push(temp_vvvvwbu);
 	}
-	else if (!isSet(protocol_vvvvwbt))
+	else if (!isSet(protocol_vvvvwbu))
 	{
-		var protocol_vvvvwbt = [];
+		var protocol_vvvvwbu = [];
 	}
-	var protocol = protocol_vvvvwbt.some(protocol_vvvvwbt_SomeFunc);
+	var protocol = protocol_vvvvwbu.some(protocol_vvvvwbu_SomeFunc);
 
-	if (isSet(authentication_vvvvwbt) && authentication_vvvvwbt.constructor !== Array)
+	if (isSet(authentication_vvvvwbu) && authentication_vvvvwbu.constructor !== Array)
 	{
-		var temp_vvvvwbt = authentication_vvvvwbt;
-		var authentication_vvvvwbt = [];
-		authentication_vvvvwbt.push(temp_vvvvwbt);
+		var temp_vvvvwbu = authentication_vvvvwbu;
+		var authentication_vvvvwbu = [];
+		authentication_vvvvwbu.push(temp_vvvvwbu);
 	}
-	else if (!isSet(authentication_vvvvwbt))
+	else if (!isSet(authentication_vvvvwbu))
 	{
-		var authentication_vvvvwbt = [];
+		var authentication_vvvvwbu = [];
 	}
-	var authentication = authentication_vvvvwbt.some(authentication_vvvvwbt_SomeFunc);
+	var authentication = authentication_vvvvwbu.some(authentication_vvvvwbu_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwbtway_required)
+		if (jform_vvvvwbuwaz_required)
 		{
 			updateFieldRequired('private_key',0);
 			jQuery('#jform_private_key').prop('required','required');
 			jQuery('#jform_private_key').attr('aria-required',true);
 			jQuery('#jform_private_key').addClass('required');
-			jform_vvvvwbtway_required = false;
+			jform_vvvvwbuwaz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwbtway_required)
+		if (!jform_vvvvwbuwaz_required)
 		{
 			updateFieldRequired('private_key',1);
 			jQuery('#jform_private_key').removeAttr('required');
 			jQuery('#jform_private_key').removeAttr('aria-required');
 			jQuery('#jform_private_key').removeClass('required');
-			jform_vvvvwbtway_required = true;
+			jform_vvvvwbuwaz_required = true;
 		}
 	}
 }
 
-// the vvvvwbt Some function
-function protocol_vvvvwbt_SomeFunc(protocol_vvvvwbt)
+// the vvvvwbu Some function
+function protocol_vvvvwbu_SomeFunc(protocol_vvvvwbu)
 {
 	// set the function logic
-	if (protocol_vvvvwbt == 2)
+	if (protocol_vvvvwbu == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbt Some function
-function authentication_vvvvwbt_SomeFunc(authentication_vvvvwbt)
+// the vvvvwbu Some function
+function authentication_vvvvwbu_SomeFunc(authentication_vvvvwbu)
 {
 	// set the function logic
-	if (authentication_vvvvwbt == 4 || authentication_vvvvwbt == 5)
+	if (authentication_vvvvwbu == 4 || authentication_vvvvwbu == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbv function
-function vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv)
+// the vvvvwbw function
+function vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw)
 {
-	if (isSet(protocol_vvvvwbv) && protocol_vvvvwbv.constructor !== Array)
+	if (isSet(protocol_vvvvwbw) && protocol_vvvvwbw.constructor !== Array)
 	{
-		var temp_vvvvwbv = protocol_vvvvwbv;
-		var protocol_vvvvwbv = [];
-		protocol_vvvvwbv.push(temp_vvvvwbv);
+		var temp_vvvvwbw = protocol_vvvvwbw;
+		var protocol_vvvvwbw = [];
+		protocol_vvvvwbw.push(temp_vvvvwbw);
 	}
-	else if (!isSet(protocol_vvvvwbv))
+	else if (!isSet(protocol_vvvvwbw))
 	{
-		var protocol_vvvvwbv = [];
+		var protocol_vvvvwbw = [];
 	}
-	var protocol = protocol_vvvvwbv.some(protocol_vvvvwbv_SomeFunc);
+	var protocol = protocol_vvvvwbw.some(protocol_vvvvwbw_SomeFunc);
 
-	if (isSet(authentication_vvvvwbv) && authentication_vvvvwbv.constructor !== Array)
+	if (isSet(authentication_vvvvwbw) && authentication_vvvvwbw.constructor !== Array)
 	{
-		var temp_vvvvwbv = authentication_vvvvwbv;
-		var authentication_vvvvwbv = [];
-		authentication_vvvvwbv.push(temp_vvvvwbv);
+		var temp_vvvvwbw = authentication_vvvvwbw;
+		var authentication_vvvvwbw = [];
+		authentication_vvvvwbw.push(temp_vvvvwbw);
 	}
-	else if (!isSet(authentication_vvvvwbv))
+	else if (!isSet(authentication_vvvvwbw))
 	{
-		var authentication_vvvvwbv = [];
+		var authentication_vvvvwbw = [];
 	}
-	var authentication = authentication_vvvvwbv.some(authentication_vvvvwbv_SomeFunc);
+	var authentication = authentication_vvvvwbw.some(authentication_vvvvwbw_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv)
 	}
 }
 
-// the vvvvwbv Some function
-function protocol_vvvvwbv_SomeFunc(protocol_vvvvwbv)
+// the vvvvwbw Some function
+function protocol_vvvvwbw_SomeFunc(protocol_vvvvwbw)
 {
 	// set the function logic
-	if (protocol_vvvvwbv == 2)
+	if (protocol_vvvvwbw == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbv Some function
-function authentication_vvvvwbv_SomeFunc(authentication_vvvvwbv)
+// the vvvvwbw Some function
+function authentication_vvvvwbw_SomeFunc(authentication_vvvvwbw)
 {
 	// set the function logic
-	if (authentication_vvvvwbv == 2 || authentication_vvvvwbv == 3 || authentication_vvvvwbv == 4 || authentication_vvvvwbv == 5)
+	if (authentication_vvvvwbw == 2 || authentication_vvvvwbw == 3 || authentication_vvvvwbw == 4 || authentication_vvvvwbw == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js
index 927686d42..f175430d6 100644
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyrvyn_required = false;
 jform_vvvvvysvyo_required = false;
 jform_vvvvvytvyp_required = false;
 jform_vvvvvyuvyq_required = false;
@@ -19,317 +18,318 @@ jform_vvvvvyxvyt_required = false;
 jform_vvvvvyyvyu_required = false;
 jform_vvvvvyzvyv_required = false;
 jform_vvvvvzavyw_required = false;
-jform_vvvvvzavyx_required = false;
+jform_vvvvvzbvyx_required = false;
+jform_vvvvvzbvyy_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyr = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyr(add_php_view_vvvvvyr);
+	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvys(add_php_view_vvvvvys);
 
-	var add_php_jview_display_vvvvvys = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvys(add_php_jview_display_vvvvvys);
+	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyt(add_php_jview_display_vvvvvyt);
 
-	var add_php_jview_vvvvvyt = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_vvvvvyt);
+	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyu(add_php_jview_vvvvvyu);
 
-	var add_php_document_vvvvvyu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyu(add_php_document_vvvvvyu);
+	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyv(add_php_document_vvvvvyv);
 
-	var add_css_document_vvvvvyv = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyv(add_css_document_vvvvvyv);
+	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyw(add_css_document_vvvvvyw);
 
-	var add_javascript_file_vvvvvyw = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyw(add_javascript_file_vvvvvyw);
+	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyx(add_javascript_file_vvvvvyx);
 
-	var add_js_document_vvvvvyx = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyx(add_js_document_vvvvvyx);
+	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyy(add_js_document_vvvvvyy);
 
-	var add_css_vvvvvyy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyy(add_css_vvvvvyy);
+	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyz(add_css_vvvvvyz);
 
-	var add_php_ajax_vvvvvyz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyz(add_php_ajax_vvvvvyz);
+	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvza(add_php_ajax_vvvvvza);
 
-	var add_custom_button_vvvvvza = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvza(add_custom_button_vvvvvza);
+	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzb(add_custom_button_vvvvvzb);
 
-	var button_position_vvvvvzb = jQuery("#jform_button_position").val();
-	vvvvvzb(button_position_vvvvvzb);
+	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
+	vvvvvzc(button_position_vvvvvzc);
 });
 
-// the vvvvvyr function
-function vvvvvyr(add_php_view_vvvvvyr)
+// the vvvvvys function
+function vvvvvys(add_php_view_vvvvvys)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyr == 1)
+	if (add_php_view_vvvvvys == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvyrvyn_required)
+		if (jform_vvvvvysvyo_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyrvyn_required = false;
+			jform_vvvvvysvyo_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvyrvyn_required)
+		if (!jform_vvvvvysvyo_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyrvyn_required = true;
-		}
-	}
-}
-
-// the vvvvvys function
-function vvvvvys(add_php_jview_display_vvvvvys)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvys == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvysvyo_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvysvyo_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvysvyo_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvysvyo_required = true;
 		}
 	}
 }
 
 // the vvvvvyt function
-function vvvvvyt(add_php_jview_vvvvvyt)
+function vvvvvyt(add_php_jview_display_vvvvvyt)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyt == 1)
+	if (add_php_jview_display_vvvvvyt == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
+		// add required attribute to php_jview_display field
 		if (jform_vvvvvytvyp_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvytvyp_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview_display field
 		if (!jform_vvvvvytvyp_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvytvyp_required = true;
 		}
 	}
 }
 
 // the vvvvvyu function
-function vvvvvyu(add_php_document_vvvvvyu)
+function vvvvvyu(add_php_jview_vvvvvyu)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyu == 1)
+	if (add_php_jview_vvvvvyu == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		// add required attribute to php_jview field
 		if (jform_vvvvvyuvyq_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvyuvyq_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview field
 		if (!jform_vvvvvyuvyq_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvyuvyq_required = true;
 		}
 	}
 }
 
 // the vvvvvyv function
-function vvvvvyv(add_css_document_vvvvvyv)
+function vvvvvyv(add_php_document_vvvvvyv)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyv == 1)
+	if (add_php_document_vvvvvyv == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		// add required attribute to php_document field
 		if (jform_vvvvvyvvyr_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyvvyr_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		// remove required attribute from php_document field
 		if (!jform_vvvvvyvvyr_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyvvyr_required = true;
 		}
 	}
 }
 
 // the vvvvvyw function
-function vvvvvyw(add_javascript_file_vvvvvyw)
+function vvvvvyw(add_css_document_vvvvvyw)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyw == 1)
+	if (add_css_document_vvvvvyw == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		// add required attribute to css_document field
 		if (jform_vvvvvywvys_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvywvys_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		// remove required attribute from css_document field
 		if (!jform_vvvvvywvys_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvywvys_required = true;
 		}
 	}
 }
 
 // the vvvvvyx function
-function vvvvvyx(add_js_document_vvvvvyx)
+function vvvvvyx(add_javascript_file_vvvvvyx)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyx == 1)
+	if (add_javascript_file_vvvvvyx == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		// add required attribute to javascript_file field
 		if (jform_vvvvvyxvyt_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyxvyt_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_file field
 		if (!jform_vvvvvyxvyt_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyxvyt_required = true;
 		}
 	}
 }
 
 // the vvvvvyy function
-function vvvvvyy(add_css_vvvvvyy)
+function vvvvvyy(add_js_document_vvvvvyy)
 {
 	// set the function logic
-	if (add_css_vvvvvyy == 1)
+	if (add_js_document_vvvvvyy == 1)
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		// add required attribute to js_document field
 		if (jform_vvvvvyyvyu_required)
 		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
 			jform_vvvvvyyvyu_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		// remove required attribute from js_document field
 		if (!jform_vvvvvyyvyu_required)
 		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvyyvyu_required = true;
 		}
 	}
 }
 
 // the vvvvvyz function
-function vvvvvyz(add_php_ajax_vvvvvyz)
+function vvvvvyz(add_css_vvvvvyz)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyz == 1)
+	if (add_css_vvvvvyz == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		// add required attribute to css field
+		if (jform_vvvvvyzvyv_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyzvyv_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		// remove required attribute from css field
+		if (!jform_vvvvvyzvyv_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyzvyv_required = true;
+		}
+	}
+}
+
+// the vvvvvza function
+function vvvvvza(add_php_ajax_vvvvvza)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvza == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
 		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvyzvyv_required)
+		if (jform_vvvvvzavyw_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyzvyv_required = false;
+			jform_vvvvvzavyw_required = false;
 		}
 	}
 	else
@@ -337,43 +337,43 @@ function vvvvvyz(add_php_ajax_vvvvvyz)
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
 		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvyzvyv_required)
+		if (!jform_vvvvvzavyw_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyzvyv_required = true;
+			jform_vvvvvzavyw_required = true;
 		}
 	}
 }
 
-// the vvvvvza function
-function vvvvvza(add_custom_button_vvvvvza)
+// the vvvvvzb function
+function vvvvvzb(add_custom_button_vvvvvzb)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvza == 1)
+	if (add_custom_button_vvvvvzb == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvzavyw_required)
+		if (jform_vvvvvzbvyx_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvzavyw_required = false;
+			jform_vvvvvzbvyx_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvzavyx_required)
+		if (jform_vvvvvzbvyy_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvzavyx_required = false;
+			jform_vvvvvzbvyy_required = false;
 		}
 	}
 	else
@@ -381,41 +381,41 @@ function vvvvvza(add_custom_button_vvvvvza)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvzavyw_required)
+		if (!jform_vvvvvzbvyx_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvzavyw_required = true;
+			jform_vvvvvzbvyx_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvzavyx_required)
+		if (!jform_vvvvvzbvyy_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvzavyx_required = true;
+			jform_vvvvvzbvyy_required = true;
 		}
 	}
 }
 
-// the vvvvvzb function
-function vvvvvzb(button_position_vvvvvzb)
+// the vvvvvzc function
+function vvvvvzc(button_position_vvvvvzc)
 {
-	if (isSet(button_position_vvvvvzb) && button_position_vvvvvzb.constructor !== Array)
+	if (isSet(button_position_vvvvvzc) && button_position_vvvvvzc.constructor !== Array)
 	{
-		var temp_vvvvvzb = button_position_vvvvvzb;
-		var button_position_vvvvvzb = [];
-		button_position_vvvvvzb.push(temp_vvvvvzb);
+		var temp_vvvvvzc = button_position_vvvvvzc;
+		var button_position_vvvvvzc = [];
+		button_position_vvvvvzc.push(temp_vvvvvzc);
 	}
-	else if (!isSet(button_position_vvvvvzb))
+	else if (!isSet(button_position_vvvvvzc))
 	{
-		var button_position_vvvvvzb = [];
+		var button_position_vvvvvzc = [];
 	}
-	var button_position = button_position_vvvvvzb.some(button_position_vvvvvzb_SomeFunc);
+	var button_position = button_position_vvvvvzc.some(button_position_vvvvvzc_SomeFunc);
 
 
 	// set this function logic
@@ -429,11 +429,11 @@ function vvvvvzb(button_position_vvvvvzb)
 	}
 }
 
-// the vvvvvzb Some function
-function button_position_vvvvvzb_SomeFunc(button_position_vvvvvzb)
+// the vvvvvzc Some function
+function button_position_vvvvvzc_SomeFunc(button_position_vvvvvzc)
 {
 	// set the function logic
-	if (button_position_vvvvvzb == 5)
+	if (button_position_vvvvvzc == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js
index 595af1b84..b4aaf727b 100644
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvvzcvyy_required = false;
+jform_vvvvvzdvyz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzc = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzc(add_php_view_vvvvvzc);
+	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzd(add_php_view_vvvvvzd);
 });
 
-// the vvvvvzc function
-function vvvvvzc(add_php_view_vvvvvzc)
+// the vvvvvzd function
+function vvvvvzd(add_php_view_vvvvvzd)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzc == 1)
+	if (add_php_view_vvvvvzd == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvzcvyy_required)
+		if (jform_vvvvvzdvyz_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzcvyy_required = false;
+			jform_vvvvvzdvyz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvzcvyy_required)
+		if (!jform_vvvvvzdvyz_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzcvyy_required = true;
+			jform_vvvvvzdvyz_required = true;
 		}
 	}
 }
diff --git a/admin/models/server.php b/admin/models/server.php
index 996a3b3d2..6d6ef0605 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -156,7 +156,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWazlinked_components()
+	public function getWbalinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index b4ad5150d..6365442c1 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -160,6 +160,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`add_php_allowedit` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_batchcopy` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_batchmove` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_before_cancel` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_before_delete` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_before_publish` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_before_save` TINYINT(1) NOT NULL DEFAULT 0,
@@ -204,6 +205,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`php_allowedit` MEDIUMTEXT NOT NULL,
 	`php_batchcopy` MEDIUMTEXT NOT NULL,
 	`php_batchmove` MEDIUMTEXT NOT NULL,
+	`php_before_cancel` MEDIUMTEXT NOT NULL,
 	`php_before_delete` MEDIUMTEXT NOT NULL,
 	`php_before_publish` MEDIUMTEXT NOT NULL,
 	`php_before_save` MEDIUMTEXT NOT NULL,
@@ -249,28 +251,29 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_modifiedby` (`modified_by`),
 	KEY `idx_state` (`published`),
 	KEY `idx_name_single` (`name_single`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_php_before_cancel` (`add_php_before_cancel`),
 	KEY `idx_add_php_allowadd` (`add_php_allowadd`),
 	KEY `idx_add_php_save` (`add_php_save`),
 	KEY `idx_add_php_getform` (`add_php_getform`),
 	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_php_document` (`add_php_document`),
+	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
-	KEY `idx_mysql_table_collate` (`mysql_table_collate`),
+	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_mysql_table_engine` (`mysql_table_engine`),
 	KEY `idx_type` (`type`),
-	KEY `idx_add_custom_import` (`add_custom_import`),
-	KEY `idx_name_list` (`name_list`),
 	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
 	KEY `idx_add_php_before_save` (`add_php_before_save`),
 	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
 	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
-	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
-	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
-	KEY `idx_mysql_table_engine` (`mysql_table_engine`),
-	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
+	KEY `idx_add_php_document` (`add_php_document`),
+	KEY `idx_mysql_table_collate` (`mysql_table_collate`),
+	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_name_list` (`name_list`),
 	KEY `idx_add_css_view` (`add_css_view`),
 	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
diff --git a/admin/sql/updates/mysql/2.9.18.sql b/admin/sql/updates/mysql/2.9.18.sql
new file mode 100644
index 000000000..8e8c67c18
--- /dev/null
+++ b/admin/sql/updates/mysql/2.9.18.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_before_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_batchmove`;
+
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_before_cancel` MEDIUMTEXT NOT NULL AFTER `php_batchmove`;
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index 9e7213dcc..a7e598a70 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -463,206 +463,206 @@ jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxs function
+// #jform_add_php_before_cancel listeners for add_php_before_cancel_vvvvvxs function
+jQuery('#jform_add_php_before_cancel').on('keyup',function()
+{
+	var add_php_before_cancel_vvvvvxs = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
+	vvvvvxs(add_php_before_cancel_vvvvvxs);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_before_cancel',function (e)
+{
+	e.preventDefault();
+	var add_php_before_cancel_vvvvvxs = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
+	vvvvvxs(add_php_before_cancel_vvvvvxs);
+
+});
+
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxt function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxs = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxs(add_php_batchcopy_vvvvvxs);
+	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxt(add_php_batchcopy_vvvvvxt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxs = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxs(add_php_batchcopy_vvvvvxs);
+	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxt(add_php_batchcopy_vvvvvxt);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxt function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxu function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxt = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchmove_vvvvvxt);
+	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxu(add_php_batchmove_vvvvvxu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxt = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchmove_vvvvvxt);
+	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxu(add_php_batchmove_vvvvvxu);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxu function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxv function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxu = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxu(add_php_before_publish_vvvvvxu);
+	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxv(add_php_before_publish_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxu = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxu(add_php_before_publish_vvvvvxu);
+	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxv(add_php_before_publish_vvvvvxv);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxv function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxw function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxv = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_after_publish_vvvvvxv);
+	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxw(add_php_after_publish_vvvvvxw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxv = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_after_publish_vvvvvxv);
+	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxw(add_php_after_publish_vvvvvxw);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxw function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxx function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxw = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxw(add_php_before_delete_vvvvvxw);
+	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxx(add_php_before_delete_vvvvvxx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxw = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxw(add_php_before_delete_vvvvvxw);
+	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxx(add_php_before_delete_vvvvvxx);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxx function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxy function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxx = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_after_delete_vvvvvxx);
+	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxy(add_php_after_delete_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxx = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_after_delete_vvvvvxx);
+	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxy(add_php_after_delete_vvvvvxy);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvxy function
+// #jform_add_php_document listeners for add_php_document_vvvvvxz function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxy = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxy(add_php_document_vvvvvxy);
+	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxz(add_php_document_vvvvvxz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxy = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxy(add_php_document_vvvvvxy);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvxz function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(add_sql_vvvvvxz);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxz(add_sql_vvvvvxz);
-
-});
-
-// #jform_source listeners for source_vvvvvya function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxz(add_php_document_vvvvvxz);
 
 });
 
 // #jform_add_sql listeners for add_sql_vvvvvya function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	vvvvvya(add_sql_vvvvvya);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	vvvvvya(add_sql_vvvvvya);
 
 });
 
-// #jform_source listeners for source_vvvvvyc function
+// #jform_source listeners for source_vvvvvyb function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvyc function
+// #jform_add_sql listeners for add_sql_vvvvvyb function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvye function
-jQuery('#jform_add_custom_import').on('keyup',function()
+// #jform_source listeners for source_vvvvvyd function
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvye = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvye(add_custom_import_vvvvvye);
+	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvye = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvye(add_custom_import_vvvvvye);
+	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvyd function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
 
 });
 
@@ -681,18 +681,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyg function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvyg function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvyg = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyg(add_custom_import_vvvvvyg);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvyg = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyg(add_custom_import_vvvvvyg);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyh function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyh(add_custom_button_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyh(add_custom_button_vvvvvyh);
 
 });
 
diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php
index 6eda4b010..b0d6a8416 100644
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@@ -163,153 +163,153 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyh function
+// #jform_add_php_view listeners for add_php_view_vvvvvyi function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyh = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyh(add_php_view_vvvvvyh);
+	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyi(add_php_view_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyh = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyh(add_php_view_vvvvvyh);
+	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyi(add_php_view_vvvvvyi);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyi function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyj function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyi(add_php_jview_display_vvvvvyi);
+	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyj(add_php_jview_display_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyi = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyi(add_php_jview_display_vvvvvyi);
+	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyj(add_php_jview_display_vvvvvyj);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyj function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyk function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyj = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_vvvvvyj);
+	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyk(add_php_jview_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyj = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_vvvvvyj);
+	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyk(add_php_jview_vvvvvyk);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyk function
+// #jform_add_php_document listeners for add_php_document_vvvvvyl function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyk = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyk(add_php_document_vvvvvyk);
+	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyl(add_php_document_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyk = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyk(add_php_document_vvvvvyk);
+	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyl(add_php_document_vvvvvyl);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyl function
+// #jform_add_css_document listeners for add_css_document_vvvvvym function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyl = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyl(add_css_document_vvvvvyl);
+	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvym(add_css_document_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyl = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyl(add_css_document_vvvvvyl);
+	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvym(add_css_document_vvvvvym);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvym function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyn function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvym = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvym(add_javascript_file_vvvvvym);
+	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyn(add_javascript_file_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvym = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvym(add_javascript_file_vvvvvym);
+	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyn(add_javascript_file_vvvvvyn);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyn function
+// #jform_add_js_document listeners for add_js_document_vvvvvyo function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyo(add_js_document_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyo(add_js_document_vvvvvyo);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyo function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyp function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyo = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyo(add_custom_button_vvvvvyo);
+	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyp(add_custom_button_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyo = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyo(add_custom_button_vvvvvyo);
+	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyp(add_custom_button_vvvvvyp);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyp function
+// #jform_add_css listeners for add_css_vvvvvyq function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyp = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyp(add_css_vvvvvyp);
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyq(add_css_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyp = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyp(add_css_vvvvvyp);
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyq(add_css_vvvvvyq);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyq function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyr function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyq = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyq(add_php_ajax_vvvvvyq);
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyq = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyq(add_php_ajax_vvvvvyq);
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
 });
 
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index f8daef458..70e1f0dc8 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvwaf function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaf(target_vvvvwaf);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaf(target_vvvvwaf);
-
-});
-
 // #jform_target listeners for target_vvvvwag function
 jQuery('#jform_target').on('keyup',function()
 {
@@ -150,67 +135,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwah = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwah(target_vvvvwah,type_vvvvwah);
+	vvvvwah(target_vvvvwah);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwah = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwah(target_vvvvwah,type_vvvvwah);
-
-});
-
-// #jform_type listeners for type_vvvvwah function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwah = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwah(target_vvvvwah,type_vvvvwah);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwah = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwah(target_vvvvwah,type_vvvvwah);
-
-});
-
-// #jform_type listeners for type_vvvvwai function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai,target_vvvvwai);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai,target_vvvvwai);
+	vvvvwah(target_vvvvwah);
 
 });
 
 // #jform_target listeners for target_vvvvwai function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai,target_vvvvwai);
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai,type_vvvvwai);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwai(type_vvvvwai,target_vvvvwai);
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai,type_vvvvwai);
+
+});
+
+// #jform_type listeners for type_vvvvwai function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai,type_vvvvwai);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwai(target_vvvvwai,type_vvvvwai);
+
+});
+
+// #jform_type listeners for type_vvvvwaj function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+
+});
+
+// #jform_target listeners for target_vvvvwaj function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
 
 });
 
diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php
index f1fb7a49a..13281dd2b 100644
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@@ -159,33 +159,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvze function
+// #jform_gettype listeners for gettype_vvvvvzf function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
-	vvvvvze(gettype_vvvvvze);
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(gettype_vvvvvzf);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvze = jQuery("#jform_gettype").val();
-	vvvvvze(gettype_vvvvvze);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvzf function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(gettype_vvvvvzf);
 
 });
 
@@ -249,18 +234,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvzk function
-jQuery('#jform_addcalculation').on('keyup',function()
+// #jform_main_source listeners for main_source_vvvvvzk function
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzk(addcalculation_vvvvvzk);
+	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
+	vvvvvzk(main_source_vvvvvzk);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzk(addcalculation_vvvvvzk);
+	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
+	vvvvvzk(main_source_vvvvvzk);
 
 });
 
@@ -268,33 +253,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(addcalculation_vvvvvzl);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzl function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(addcalculation_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(addcalculation_vvvvvzl);
 
 });
 
@@ -332,18 +298,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzp function
-jQuery('#jform_main_source').on('keyup',function()
+// #jform_addcalculation listeners for addcalculation_vvvvvzn function
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzp = jQuery("#jform_main_source").val();
-	vvvvvzp(main_source_vvvvvzp);
+	var addcalculation_vvvvvzn = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn);
 
 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzp = jQuery("#jform_main_source").val();
-	vvvvvzp(main_source_vvvvvzp);
+	var addcalculation_vvvvvzn = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzn function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzn = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzn = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn);
 
 });
 
@@ -362,203 +347,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzr function
+// #jform_main_source listeners for main_source_vvvvvzr function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzr = jQuery("#jform_main_source").val();
+	vvvvvzr(main_source_vvvvvzr);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzr = jQuery("#jform_main_source").val();
+	vvvvvzr(main_source_vvvvvzr);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzs function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzr = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitem_vvvvvzr,gettype_vvvvvzr);
+	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzr = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitem_vvvvvzr,gettype_vvvvvzr);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzr function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvvzr = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitem_vvvvvzr,gettype_vvvvvzr);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvvzr = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(add_php_before_getitem_vvvvvzr,gettype_vvvvvzr);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzs function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzs = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzs = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzs function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzs = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzs = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_after_getitem_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzu function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzt function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(gettype_vvvvvzu);
+	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(gettype_vvvvvzu);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzv function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzv = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzv = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv);
+	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzv function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvzv = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv);
+	vvvvvzv(gettype_vvvvvzv);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvzv = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(add_php_getlistquery_vvvvvzv,gettype_vvvvvzv);
+	vvvvvzv(gettype_vvvvvzv);
 
 });
 
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzw function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzw function
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzw function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzw = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_before_getitems_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzx function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzx function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzx = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzx = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzx function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzx = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzx = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_after_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzz function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzy function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzy function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	vvvvvzz(gettype_vvvvvzz);
+	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	vvvvvzz(gettype_vvvvvzz);
+	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
+	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 
@@ -596,48 +581,63 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvwac = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwac = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac);
+	vvvvwac(gettype_vvvvwac);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvwac = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwac = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac);
+	vvvvwac(gettype_vvvvwac);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwac function
+// #jform_gettype listeners for gettype_vvvvwad function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwad function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvwac = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwac = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac);
+	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwac = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwac = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwac(gettype_vvvvwac,add_php_router_parse_vvvvwac);
+	var gettype_vvvvwad = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwae function
+// #jform_gettype listeners for gettype_vvvvwaf function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	vvvvwae(gettype_vvvvwae);
+	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
+	vvvvwaf(gettype_vvvvwaf);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwae = jQuery("#jform_gettype").val();
-	vvvvwae(gettype_vvvvwae);
+	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
+	vvvvwaf(gettype_vvvvwaf);
 
 });
 
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index c8d7469a8..e674967d8 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -147,48 +147,33 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwar function
+// #jform_datalenght listeners for datalenght_vvvvwas function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwar = jQuery("#jform_datalenght").val();
-	vvvvwar(datalenght_vvvvwar);
+	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
+	vvvvwas(datalenght_vvvvwas);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwar = jQuery("#jform_datalenght").val();
-	vvvvwar(datalenght_vvvvwar);
+	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
+	vvvvwas(datalenght_vvvvwas);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwas function
+// #jform_datadefault listeners for datadefault_vvvvwat function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwas = jQuery("#jform_datadefault").val();
-	vvvvwas(datadefault_vvvvwas);
+	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
+	vvvvwat(datadefault_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwas = jQuery("#jform_datadefault").val();
-	vvvvwas(datadefault_vvvvwas);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwat function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwat = jQuery("#jform_datatype").val();
-	vvvvwat(datatype_vvvvwat);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwat = jQuery("#jform_datatype").val();
-	vvvvwat(datatype_vvvvwat);
+	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
+	vvvvwat(datadefault_vvvvwat);
 
 });
 
@@ -207,97 +192,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwav function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwav = jQuery("#jform_store").val();
-	var datatype_vvvvwav = jQuery("#jform_datatype").val();
-	vvvvwav(store_vvvvwav,datatype_vvvvwav);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwav = jQuery("#jform_store").val();
-	var datatype_vvvvwav = jQuery("#jform_datatype").val();
-	vvvvwav(store_vvvvwav,datatype_vvvvwav);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwav function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwav = jQuery("#jform_store").val();
 	var datatype_vvvvwav = jQuery("#jform_datatype").val();
-	vvvvwav(store_vvvvwav,datatype_vvvvwav);
+	vvvvwav(datatype_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwav = jQuery("#jform_store").val();
 	var datatype_vvvvwav = jQuery("#jform_datatype").val();
-	vvvvwav(store_vvvvwav,datatype_vvvvwav);
+	vvvvwav(datatype_vvvvwav);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwax function
+// #jform_store listeners for store_vvvvwaw function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwaw = jQuery("#jform_store").val();
+	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
+	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwaw = jQuery("#jform_store").val();
+	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
+	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwaw function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwaw = jQuery("#jform_store").val();
+	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
+	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwaw = jQuery("#jform_store").val();
+	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
+	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvway function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwax = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwax(add_css_view_vvvvwax);
+	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvway(add_css_view_vvvvway);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwax = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwax(add_css_view_vvvvwax);
+	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvway(add_css_view_vvvvway);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvway function
+// #jform_add_css_views listeners for add_css_views_vvvvwaz function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvway = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvway(add_css_views_vvvvway);
+	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwaz(add_css_views_vvvvwaz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvway = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvway(add_css_views_vvvvway);
+	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwaz(add_css_views_vvvvwaz);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwaz function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwba function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwaz = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwaz(add_javascript_view_footer_vvvvwaz);
+	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwba(add_javascript_view_footer_vvvvwba);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwaz = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwaz(add_javascript_view_footer_vvvvwaz);
+	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwba(add_javascript_view_footer_vvvvwba);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwba function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwbb function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwba = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_views_footer_vvvvwba);
+	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbb(add_javascript_views_footer_vvvvwbb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwba = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_views_footer_vvvvwba);
+	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbb(add_javascript_views_footer_vvvvwbb);
 
 });
 
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index c7b73a222..9f75e8fb2 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -136,344 +136,287 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwbb function
+// #jform_datalenght listeners for datalenght_vvvvwbc function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwbb = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb);
+	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbb = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb);
+	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbb function
+// #jform_has_defaults listeners for has_defaults_vvvvwbc function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datalenght_vvvvwbb = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb);
+	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbb = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbb = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbb(datalenght_vvvvwbb,has_defaults_vvvvwbb);
+	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwbd function
+// #jform_datadefault listeners for datadefault_vvvvwbe function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwbd = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd);
+	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbd = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd);
+	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbd function
+// #jform_has_defaults listeners for has_defaults_vvvvwbe function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datadefault_vvvvwbd = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd);
+	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbd = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbd(datadefault_vvvvwbd,has_defaults_vvvvwbd);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbf function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbf = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbf(datatype_vvvvwbf,has_defaults_vvvvwbf);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbf = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbf(datatype_vvvvwbf,has_defaults_vvvvwbf);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbf function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datatype_vvvvwbf = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbf(datatype_vvvvwbf,has_defaults_vvvvwbf);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbf = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbf(datatype_vvvvwbf,has_defaults_vvvvwbf);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbg function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg);
+	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwbg function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg);
+	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	vvvvwbg(has_defaults_vvvvwbg,datatype_vvvvwbg);
+	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwbh function
-jQuery('#jform_datatype').on('keyup',function()
+// #jform_has_defaults listeners for has_defaults_vvvvwbg function
+jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
+	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
 
 });
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
+	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwbh function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
 
 });
 
-// #jform_store listeners for store_vvvvwbj function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbj function
+// #jform_datatype listeners for datatype_vvvvwbh function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbj function
+// #jform_datatype listeners for datatype_vvvvwbi function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbi function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbj = jQuery("#jform_store").val();
-	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbj(store_vvvvwbj,datatype_vvvvwbj,has_defaults_vvvvwbj);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbk function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
 
 });
 
 // #jform_store listeners for store_vvvvwbk function
 jQuery('#jform_store').on('keyup',function()
 {
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbk function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwbk function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var store_vvvvwbk = jQuery("#jform_store").val();
+	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(datatype_vvvvwbk,store_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbl function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
-
-});
-
-// #jform_store listeners for store_vvvvwbl function
-jQuery('#jform_store').on('keyup',function()
-{
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
+	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwbl function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
 	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
 	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	vvvvwbl(has_defaults_vvvvwbl,store_vvvvwbl,datatype_vvvvwbl);
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+
+// #jform_store listeners for store_vvvvwbl function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbl function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 
@@ -481,14 +424,71 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 jQuery('#jform_has_defaults').on('keyup',function()
 {
 	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbm(has_defaults_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
 	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbm(has_defaults_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+
+});
+
+// #jform_store listeners for store_vvvvwbm function
+jQuery('#jform_store').on('keyup',function()
+{
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbm function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbn function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbn(has_defaults_vvvvwbn);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbn(has_defaults_vvvvwbn);
 
 });
 
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index 523a8a524..d118ef736 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -57,7 +57,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wapfields = $this->get('Wapfields');
+		$this->waqfields = $this->get('Waqfields');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 9aa5e5226..2e0d0744f 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwbx function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwbx = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbx(location_vvvvwbx);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwbx = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbx(location_vvvvwbx);
-
-});
-
 // #jform_location listeners for location_vvvvwby function
 jQuery('#jform_location').on('keyup',function()
 {
@@ -146,18 +131,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwbz function
-jQuery('#jform_type').on('keyup',function()
+// #jform_location listeners for location_vvvvwbz function
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwbz = jQuery("#jform_type").val();
-	vvvvwbz(type_vvvvwbz);
+	var location_vvvvwbz = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbz(location_vvvvwbz);
 
 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbz = jQuery("#jform_type").val();
-	vvvvwbz(type_vvvvwbz);
+	var location_vvvvwbz = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbz(location_vvvvwbz);
 
 });
 
@@ -191,18 +176,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwcc function
+// #jform_type listeners for type_vvvvwcc function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwcc = jQuery("#jform_type").val();
+	vvvvwcc(type_vvvvwcc);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwcc = jQuery("#jform_type").val();
+	vvvvwcc(type_vvvvwcc);
+
+});
+
+// #jform_target listeners for target_vvvvwcd function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwcc = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcc(target_vvvvwcc);
+	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcd(target_vvvvwcd);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwcc = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcc(target_vvvvwcc);
+	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwcd(target_vvvvwcd);
 
 });
 
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index f50dc0d7a..0f5a48490 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -129,18 +129,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzd function
+// #jform_add_php_view listeners for add_php_view_vvvvvze function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvze(add_php_view_vvvvvze);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvze(add_php_view_vvvvvze);
 
 });
 
diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php
index a3486484a..0dd3368c0 100644
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@@ -146,21 +146,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwaj function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwaj = jQuery("#jform_how").val();
-	vvvvwaj(how_vvvvwaj);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwaj = jQuery("#jform_how").val();
-	vvvvwaj(how_vvvvwaj);
-
-});
-
 // #jform_how listeners for how_vvvvwak function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -251,18 +236,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwaq function
+// #jform_how listeners for how_vvvvwaq function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwaq = jQuery("#jform_how").val();
+	vvvvwaq(how_vvvvwaq);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwaq = jQuery("#jform_how").val();
+	vvvvwaq(how_vvvvwaq);
+
+});
+
+// #jform_type listeners for type_vvvvwar function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwaq = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaq(type_vvvvwaq);
+	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwar(type_vvvvwar);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwaq = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwaq(type_vvvvwaq);
+	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwar(type_vvvvwar);
 
 });
 
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index a31794b6f..623700476 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -125,21 +125,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwbn function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwbn = jQuery("#jform_protocol").val();
-	vvvvwbn(protocol_vvvvwbn);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwbn = jQuery("#jform_protocol").val();
-	vvvvwbn(protocol_vvvvwbn);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwbo function
 jQuery('#jform_protocol').on('keyup',function()
 {
@@ -159,135 +144,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbp = jQuery("#jform_authentication").val();
-	vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp);
+	vvvvwbp(protocol_vvvvwbp);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbp = jQuery("#jform_authentication").val();
-	vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp);
+	vvvvwbp(protocol_vvvvwbp);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbp function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbp = jQuery("#jform_authentication").val();
-	vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbp = jQuery("#jform_authentication").val();
-	vvvvwbp(protocol_vvvvwbp,authentication_vvvvwbp);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwbr function
+// #jform_protocol listeners for protocol_vvvvwbq function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
+	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
+	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbr function
+// #jform_authentication listeners for authentication_vvvvwbq function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
+	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
-	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
+	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
+	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbt function
+// #jform_protocol listeners for protocol_vvvvwbs function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
+	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
+	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbt function
+// #jform_authentication listeners for authentication_vvvvwbs function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
+	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
-	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
+	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
+	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbv function
+// #jform_protocol listeners for protocol_vvvvwbu function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbv function
+// #jform_authentication listeners for authentication_vvvvwbu function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
-	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
+	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbw function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbw function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
+	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
 
 });
 
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index 1eb8d8b06..5c7953aea 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -57,7 +57,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wazlinked_components = $this->get('Wazlinked_components');
+		$this->wbalinked_components = $this->get('Wbalinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index 578119966..4bd245ec5 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -166,168 +166,168 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyr function
+// #jform_add_php_view listeners for add_php_view_vvvvvys function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyr = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyr(add_php_view_vvvvvyr);
+	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvys(add_php_view_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyr = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyr(add_php_view_vvvvvyr);
+	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvys(add_php_view_vvvvvys);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvys function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyt function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvys = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvys(add_php_jview_display_vvvvvys);
+	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyt(add_php_jview_display_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvys = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvys(add_php_jview_display_vvvvvys);
+	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyt(add_php_jview_display_vvvvvyt);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyt function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyu function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyt = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_vvvvvyt);
+	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyu(add_php_jview_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyt = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_vvvvvyt);
+	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyu(add_php_jview_vvvvvyu);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyu function
+// #jform_add_php_document listeners for add_php_document_vvvvvyv function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyu(add_php_document_vvvvvyu);
+	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyv(add_php_document_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyu = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyu(add_php_document_vvvvvyu);
+	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyv(add_php_document_vvvvvyv);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyv function
+// #jform_add_css_document listeners for add_css_document_vvvvvyw function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyv = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyv(add_css_document_vvvvvyv);
+	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyw(add_css_document_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyv = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyv(add_css_document_vvvvvyv);
+	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyw(add_css_document_vvvvvyw);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyw function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyx function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyw = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyw(add_javascript_file_vvvvvyw);
+	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyx(add_javascript_file_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyw = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyw(add_javascript_file_vvvvvyw);
+	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyx(add_javascript_file_vvvvvyx);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyx function
+// #jform_add_js_document listeners for add_js_document_vvvvvyy function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyx = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyx(add_js_document_vvvvvyx);
+	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyy(add_js_document_vvvvvyy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyx = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyx(add_js_document_vvvvvyx);
+	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyy(add_js_document_vvvvvyy);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyy function
+// #jform_add_css listeners for add_css_vvvvvyz function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyy(add_css_vvvvvyy);
+	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyz(add_css_vvvvvyz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyy(add_css_vvvvvyy);
+	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyz(add_css_vvvvvyz);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyz function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvza function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyz(add_php_ajax_vvvvvyz);
+	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvza(add_php_ajax_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyz(add_php_ajax_vvvvvyz);
+	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvza(add_php_ajax_vvvvvza);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvza function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvzb function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvza = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvza(add_custom_button_vvvvvza);
+	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzb(add_custom_button_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvza = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvza(add_custom_button_vvvvvza);
+	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzb(add_custom_button_vvvvvzb);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvzb function
+// #jform_button_position listeners for button_position_vvvvvzc function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvzb = jQuery("#jform_button_position").val();
-	vvvvvzb(button_position_vvvvvzb);
+	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
+	vvvvvzc(button_position_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvzb = jQuery("#jform_button_position").val();
-	vvvvvzb(button_position_vvvvvzb);
+	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
+	vvvvvzc(button_position_vvvvvzc);
 
 });
 
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index 5716f928e..523d96a1f 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -129,18 +129,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzc function
+// #jform_add_php_view listeners for add_php_view_vvvvvzd function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzc = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzc(add_php_view_vvvvvzc);
+	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzd(add_php_view_vvvvvzd);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzc = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzc(add_php_view_vvvvvzc);
+	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzd(add_php_view_vvvvvzd);
 
 });
 
diff --git a/componentbuilder.xml b/componentbuilder.xml
index ae52ac6cf..6f71d51a8 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>11th June, 2019</creationDate>
+	<creationDate>12th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.9.18</version>
+	<version>2.9.19</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.9.18)</h1>
+		<h1>Component Builder (v.2.9.19)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index fb7916242..4501c05b0 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -679,4 +679,21 @@
 		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.9.19</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
\ No newline at end of file
diff --git a/script.php b/script.php
index d8f0d437e..ea6a5ae89 100644
--- a/script.php
+++ b/script.php
@@ -3692,9 +3692,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_batchcopy":"add_php_batchcopy","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_document":"add_php_document","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","php_import_headers":"php_import_headers","mysql_table_collate":"mysql_table_collate","type":"type","add_custom_import":"add_custom_import","not_required":"not_required","name_list":"name_list","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","mysql_table_engine":"mysql_table_engine","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitems":"php_getitems","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","mysql_table_charset":"mysql_table_charset","php_model":"php_model","mysql_table_row_format":"mysql_table_row_format","php_controller_list":"php_controller_list","source":"source","php_model_list":"php_model_list","sql":"sql","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","php_import":"php_import","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext","add_php_getitems":"add_php_getitems"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems_after_all","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_after_delete":"add_php_after_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchmove":"add_php_batchmove","add_sql":"add_sql","add_php_after_publish":"add_php_after_publish","html_import_view":"html_import_view","mysql_table_engine":"mysql_table_engine","type":"type","not_required":"not_required","php_import_save":"php_import_save","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder_type":"alias_builder_type","mysql_table_collate":"mysql_table_collate","add_custom_import":"add_custom_import","alias_builder":"alias_builder","php_import_headers":"php_import_headers","name_list":"name_list","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","mysql_table_charset":"mysql_table_charset","php_controller_list":"php_controller_list","mysql_table_row_format":"mysql_table_row_format","php_model_list":"php_model_list","source":"source","add_php_ajax":"add_php_ajax","sql":"sql","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","add_php_getitem":"add_php_getitem","php_import":"php_import","php_getitem":"php_getitem","php_import_setdata":"php_import_setdata","add_php_getitems":"add_php_getitems","php_import_ext":"php_import_ext","php_getitems":"php_getitems"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_batchcopy","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_document","add_fadein","add_php_before_publish","add_php_before_delete","type","add_custom_import","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem","add_php_getitems"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_after_delete","add_fadein","add_php_batchmove","add_sql","add_php_after_publish","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem","add_php_getitems"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -4179,9 +4179,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_batchcopy":"add_php_batchcopy","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_document":"add_php_document","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","php_import_headers":"php_import_headers","mysql_table_collate":"mysql_table_collate","type":"type","add_custom_import":"add_custom_import","not_required":"not_required","name_list":"name_list","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","mysql_table_engine":"mysql_table_engine","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitems":"php_getitems","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","mysql_table_charset":"mysql_table_charset","php_model":"php_model","mysql_table_row_format":"mysql_table_row_format","php_controller_list":"php_controller_list","source":"source","php_model_list":"php_model_list","sql":"sql","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","php_import":"php_import","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext","add_php_getitems":"add_php_getitems"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems_after_all","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_after_delete":"add_php_after_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchmove":"add_php_batchmove","add_sql":"add_sql","add_php_after_publish":"add_php_after_publish","html_import_view":"html_import_view","mysql_table_engine":"mysql_table_engine","type":"type","not_required":"not_required","php_import_save":"php_import_save","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder_type":"alias_builder_type","mysql_table_collate":"mysql_table_collate","add_custom_import":"add_custom_import","alias_builder":"alias_builder","php_import_headers":"php_import_headers","name_list":"name_list","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","mysql_table_charset":"mysql_table_charset","php_controller_list":"php_controller_list","mysql_table_row_format":"mysql_table_row_format","php_model_list":"php_model_list","source":"source","add_php_ajax":"add_php_ajax","sql":"sql","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","add_php_getitem":"add_php_getitem","php_import":"php_import","php_getitem":"php_getitem","php_import_setdata":"php_import_setdata","add_php_getitems":"add_php_getitems","php_import_ext":"php_import_ext","php_getitems":"php_getitems"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_batchcopy","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_document","add_fadein","add_php_before_publish","add_php_before_delete","type","add_custom_import","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem","add_php_getitems"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_after_delete","add_fadein","add_php_batchmove","add_sql","add_php_after_publish","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem","add_php_getitems"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -5426,7 +5426,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.9.18 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.9.19 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 
-- 
2.40.1


From f03c6f52043ed92ae57a4896a3e715f73a2d90d6 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Wed, 12 Jun 2019 22:36:05 +0200
Subject: [PATCH 15/26] Added an after cancel custom code area also in
 connection with gh-418 in the admin view.

---
 README.md                                     |   10 +-
 admin/README.txt                              |   10 +-
 admin/compiler/joomla_3/JControllerForm.php   |    2 +-
 admin/helpers/compiler/a_Get.php              |    2 +-
 admin/helpers/compiler/f_Infusion.php         |    3 +
 .../en-GB/en-GB.com_componentbuilder.ini      |    5 +
 admin/layouts/admin_view/php_fullwidth.php    |    2 +
 admin/layouts/fieldtype/fields_fullwidth.php  |    2 +-
 .../server/linked_components_fullwidth.php    |    2 +-
 admin/models/admin_view.php                   |  216 +--
 admin/models/admin_views.php                  |   86 +-
 admin/models/fieldtype.php                    |   12 +-
 admin/models/forms/admin_view.js              |  456 +++---
 admin/models/forms/admin_view.xml             | 1217 ++++++++--------
 admin/models/forms/custom_admin_view.js       |  354 ++---
 admin/models/forms/custom_code.js             |   76 +-
 admin/models/forms/dynamic_get.js             | 1252 ++++++++---------
 admin/models/forms/field.js                   |  428 +++---
 admin/models/forms/fieldtype.js               |  632 ++++-----
 admin/models/forms/help_document.js           |  234 +--
 admin/models/forms/layout.js                  |   20 +-
 admin/models/forms/library.js                 |  188 +--
 admin/models/forms/server.js                  |  560 ++++----
 admin/models/forms/site_view.js               |  350 ++---
 admin/models/forms/template.js                |   20 +-
 admin/models/server.php                       |    2 +-
 admin/sql/install.mysql.utf8.sql              |   33 +-
 admin/sql/updates/mysql/2.9.18.sql            |    4 +-
 admin/sql/updates/mysql/2.9.19.sql            |    3 +
 admin/views/admin_view/tmpl/edit.php          |  209 +--
 admin/views/admin_views/view.html.php         |  132 +-
 admin/views/custom_admin_view/tmpl/edit.php   |  100 +-
 admin/views/custom_code/tmpl/edit.php         |  114 +-
 admin/views/dynamic_get/tmpl/edit.php         |  336 ++---
 admin/views/field/tmpl/edit.php               |  132 +-
 admin/views/fieldtype/tmpl/edit.php           |  412 +++---
 admin/views/fieldtype/view.html.php           |    2 +-
 admin/views/help_document/tmpl/edit.php       |   54 +-
 admin/views/layout/tmpl/edit.php              |   10 +-
 admin/views/library/tmpl/edit.php             |   40 +-
 admin/views/server/tmpl/edit.php              |  156 +-
 admin/views/server/view.html.php              |    2 +-
 admin/views/site_view/tmpl/edit.php           |  110 +-
 admin/views/template/tmpl/edit.php            |   10 +-
 componentbuilder.xml                          |    4 +-
 componentbuilder_update_server.xml            |   19 +-
 script.php                                    |   10 +-
 47 files changed, 4081 insertions(+), 3952 deletions(-)
 create mode 100644 admin/sql/updates/mysql/2.9.19.sql

diff --git a/README.md b/README.md
index 088ed10a2..e757a3493 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.19) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.20) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -147,12 +147,12 @@ TODO
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 12th June, 2019
-+ *Version*: 2.9.19
++ *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206728**
-+ *Field count*: **1138**
-+ *File count*: **1345**
++ *Line count*: **206854**
++ *Field count*: **1140**
++ *File count*: **1346**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index 088ed10a2..e757a3493 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.19) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.20) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -147,12 +147,12 @@ TODO
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
 + *Last Build*: 12th June, 2019
-+ *Version*: 2.9.19
++ *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206728**
-+ *Field count*: **1138**
-+ *File count*: **1345**
++ *Line count*: **206854**
++ *Field count*: **1140**
++ *File count*: **1346**
 + *Folder count*: **209**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/JControllerForm.php
index d5700c152..3f5e8f1c6 100644
--- a/admin/compiler/joomla_3/JControllerForm.php
+++ b/admin/compiler/joomla_3/JControllerForm.php
@@ -177,7 +177,7 @@ class ###Component###Controller###View### extends JControllerForm
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
-		}
+		}###JCONTROLLERFORM_AFTERCANCEL###
 		return $cancel;
 	}
 
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 48fe02d08..86006c249 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -2046,7 +2046,7 @@ class Get
 				}
 			}
 			// add_php
-			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_cancel', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
+			$addArrayP = array('php_getitem', 'php_before_save', 'php_save', 'php_getform', 'php_postsavehook', 'php_getitems', 'php_getitems_after_all', 'php_getlistquery', 'php_allowadd', 'php_allowedit', 'php_before_cancel', 'php_after_cancel', 'php_before_delete', 'php_after_delete', 'php_before_publish', 'php_after_publish', 'php_batchcopy', 'php_batchmove', 'php_document');
 			foreach ($addArrayP as $scripter)
 			{
 				if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1)
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index cfe129b60..faee0ef9b 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -534,6 +534,9 @@ class Infusion extends Interpretation
 				// JCONTROLLERFORM_BEFORECANCEL <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_BEFORECANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_before_cancel', $viewName_single, PHP_EOL, null, null, '');
 
+				// JCONTROLLERFORM_AFTERCANCEL <<<DYNAMIC>>>
+				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_AFTERCANCEL' . $this->hhh] = $this->getCustomScriptBuilder('php_after_cancel', $viewName_single, PHP_EOL, null, null, '');
+
 				// JCONTROLLERFORM_ALLOWEDIT <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_single][$this->hhh . 'JCONTROLLERFORM_ALLOWEDIT' . $this->hhh] = $this->setJcontrollerAllowEdit($viewName_single, $viewName_list);
 
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index ca9b1b4d1..86fb778ea 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -493,6 +493,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON="Add New Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON="Add New & Close Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON="Add New + New & Close Button"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL="Add Php After Cancel"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL_LABEL="Add PHP (script - after cancel)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE="Add Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL="Add PHP (script - after delete)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH="Add Php After Publish"
@@ -971,6 +973,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL="Php After Cancel"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_DESCRIPTION="Add PHP Here that should run in the Cancel Method after cancel. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_LABEL="PHP Cancel Method after<br /><small>(string) $key is the name of the primary key of the URL variable.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE="Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add PHP Here that should run in the delete Method after items were deleted. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL="PHP delete Method after<br /><small>Target (array) $pks  is an array of record primary keys.</small>"
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index 32e231549..9d4ee2be4 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -40,6 +40,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_allowedit',
 	'add_php_before_cancel',
 	'php_before_cancel',
+	'add_php_after_cancel',
+	'php_after_cancel',
 	'add_php_batchcopy',
 	'php_batchcopy',
 	'add_php_batchmove',
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index be5611b20..87f383cbc 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->waqfields;
+$items = $displayData->warfields;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
index 14a1587a7..859a76e18 100644
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->wbalinked_components;
+$items = $displayData->wbblinked_components;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index ae0ec90f7..c9eee9307 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -86,6 +86,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
+			if (!empty($item->php_import_headers))
+			{
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
+			}
+
 			if (!empty($item->html_import_view))
 			{
 				// base64 Decode html_import_view.
@@ -98,12 +104,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
-			if (!empty($item->php_import_headers))
-			{
-				// base64 Decode php_import_headers.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
 			if (!empty($item->php_getitems_after_all))
 			{
 				// base64 Decode php_getitems_after_all.
@@ -182,10 +182,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_before_cancel = base64_decode($item->php_before_cancel);
 			}
 
-			if (!empty($item->php_batchcopy))
+			if (!empty($item->php_after_cancel))
 			{
-				// base64 Decode php_batchcopy.
-				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+				// base64 Decode php_after_cancel.
+				$item->php_after_cancel = base64_decode($item->php_after_cancel);
 			}
 
 			if (!empty($item->javascript_views_file))
@@ -194,24 +194,30 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_batchcopy))
+			{
+				// base64 Decode php_batchcopy.
+				$item->php_batchcopy = base64_decode($item->php_batchcopy);
+			}
+
 			if (!empty($item->php_batchmove))
 			{
 				// base64 Decode php_batchmove.
 				$item->php_batchmove = base64_decode($item->php_batchmove);
 			}
 
-			if (!empty($item->php_before_publish))
-			{
-				// base64 Decode php_before_publish.
-				$item->php_before_publish = base64_decode($item->php_before_publish);
-			}
-
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_before_publish))
+			{
+				// base64 Decode php_before_publish.
+				$item->php_before_publish = base64_decode($item->php_before_publish);
+			}
+
 			if (!empty($item->php_after_publish))
 			{
 				// base64 Decode php_after_publish.
@@ -224,22 +230,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_before_delete = base64_decode($item->php_before_delete);
 			}
 
-			if (!empty($item->php_after_delete))
-			{
-				// base64 Decode php_after_delete.
-				$item->php_after_delete = base64_decode($item->php_after_delete);
-			}
-
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
-			if (!empty($item->php_document))
+			if (!empty($item->php_after_delete))
 			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
+				// base64 Decode php_after_delete.
+				$item->php_after_delete = base64_decode($item->php_after_delete);
 			}
 
 			if (!empty($item->php_model))
@@ -248,6 +248,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_model = base64_decode($item->php_model);
 			}
 
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
 			if (!empty($item->php_controller_list))
 			{
 				// base64 Decode php_controller_list.
@@ -260,52 +266,60 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_model_list = base64_decode($item->php_model_list);
 			}
 
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
 			if (!empty($item->php_ajaxmethod))
 			{
 				// base64 Decode php_ajaxmethod.
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->php_import_display))
 			{
 				// base64 Decode php_import_display.
 				$item->php_import_display = base64_decode($item->php_import_display);
 			}
 
-			if (!empty($item->php_import))
-			{
-				// base64 Decode php_import.
-				$item->php_import = base64_decode($item->php_import);
-			}
-
 			if (!empty($item->php_getitem))
 			{
 				// base64 Decode php_getitem.
 				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
+			if (!empty($item->php_import))
+			{
+				// base64 Decode php_import.
+				$item->php_import = base64_decode($item->php_import);
+			}
+
 			if (!empty($item->php_import_setdata))
 			{
 				// base64 Decode php_import_setdata.
 				$item->php_import_setdata = base64_decode($item->php_import_setdata);
 			}
 
+			if (!empty($item->php_getitems))
+			{
+				// base64 Decode php_getitems.
+				$item->php_getitems = base64_decode($item->php_getitems);
+			}
+
 			if (!empty($item->php_import_ext))
 			{
 				// base64 Decode php_import_ext.
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
-			if (!empty($item->php_getitems))
+			if (!empty($item->addtables))
 			{
-				// base64 Decode php_getitems.
-				$item->php_getitems = base64_decode($item->php_getitems);
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
 			}
 
 			if (!empty($item->addpermissions))
@@ -332,14 +346,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->addlinked_views = $addlinked_views->toArray();
 			}
 
-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->alias_builder))
 			{
 				// Convert the alias_builder field to an array.
@@ -1244,6 +1250,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1283,19 +1302,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['addlinked_views'] = '';
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the alias_builder items to data.
 		if (isset($data['alias_builder']) && is_array($data['alias_builder']))
 		{
@@ -1335,6 +1341,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
+		{
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+		}
+
 		// Set the html_import_view string to base64 string.
 		if (isset($data['html_import_view']))
 		{
@@ -1347,12 +1359,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
-		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_headers']))
-		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
 		// Set the php_getitems_after_all string to base64 string.
 		if (isset($data['php_getitems_after_all']))
 		{
@@ -1431,10 +1437,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_before_cancel'] = base64_encode($data['php_before_cancel']);
 		}
 
-		// Set the php_batchcopy string to base64 string.
-		if (isset($data['php_batchcopy']))
+		// Set the php_after_cancel string to base64 string.
+		if (isset($data['php_after_cancel']))
 		{
-			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+			$data['php_after_cancel'] = base64_encode($data['php_after_cancel']);
 		}
 
 		// Set the javascript_views_file string to base64 string.
@@ -1443,24 +1449,30 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_batchcopy string to base64 string.
+		if (isset($data['php_batchcopy']))
+		{
+			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
+		}
+
 		// Set the php_batchmove string to base64 string.
 		if (isset($data['php_batchmove']))
 		{
 			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
 		}
 
-		// Set the php_before_publish string to base64 string.
-		if (isset($data['php_before_publish']))
-		{
-			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
-		}
-
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_before_publish string to base64 string.
+		if (isset($data['php_before_publish']))
+		{
+			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
+		}
+
 		// Set the php_after_publish string to base64 string.
 		if (isset($data['php_after_publish']))
 		{
@@ -1473,22 +1485,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_before_delete'] = base64_encode($data['php_before_delete']);
 		}
 
-		// Set the php_after_delete string to base64 string.
-		if (isset($data['php_after_delete']))
-		{
-			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
-		}
-
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
+		// Set the php_after_delete string to base64 string.
+		if (isset($data['php_after_delete']))
 		{
-			$data['php_document'] = base64_encode($data['php_document']);
+			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
 		}
 
 		// Set the php_model string to base64 string.
@@ -1497,6 +1503,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
 		// Set the php_controller_list string to base64 string.
 		if (isset($data['php_controller_list']))
 		{
@@ -1509,52 +1521,52 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_model_list'] = base64_encode($data['php_model_list']);
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
 		// Set the php_ajaxmethod string to base64 string.
 		if (isset($data['php_ajaxmethod']))
 		{
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the php_import_display string to base64 string.
 		if (isset($data['php_import_display']))
 		{
 			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}
 
-		// Set the php_import string to base64 string.
-		if (isset($data['php_import']))
-		{
-			$data['php_import'] = base64_encode($data['php_import']);
-		}
-
 		// Set the php_getitem string to base64 string.
 		if (isset($data['php_getitem']))
 		{
 			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
+		// Set the php_import string to base64 string.
+		if (isset($data['php_import']))
+		{
+			$data['php_import'] = base64_encode($data['php_import']);
+		}
+
 		// Set the php_import_setdata string to base64 string.
 		if (isset($data['php_import_setdata']))
 		{
 			$data['php_import_setdata'] = base64_encode($data['php_import_setdata']);
 		}
 
-		// Set the php_import_ext string to base64 string.
-		if (isset($data['php_import_ext']))
-		{
-			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
-		}
-
 		// Set the php_getitems string to base64 string.
 		if (isset($data['php_getitems']))
 		{
 			$data['php_getitems'] = base64_encode($data['php_getitems']);
+		}
+
+		// Set the php_import_ext string to base64 string.
+		if (isset($data['php_import_ext']))
+		{
+			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
 		}
         
 		// Set the Params Items to data
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index d45f5217b..a39053ef8 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -31,8 +31,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				'a.name_single','name_single',
 				'a.short_description','short_description',
 				'a.add_fadein','add_fadein',
-				'a.type','type',
 				'a.add_custom_import','add_custom_import',
+				'a.type','type',
 				'a.add_custom_button','add_custom_button',
 				'a.add_php_ajax','add_php_ajax'
 			);
@@ -67,12 +67,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$add_fadein = $this->getUserStateFromRequest($this->context . '.filter.add_fadein', 'filter_add_fadein');
 		$this->setState('filter.add_fadein', $add_fadein);
 
-		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
-		$this->setState('filter.type', $type);
-
 		$add_custom_import = $this->getUserStateFromRequest($this->context . '.filter.add_custom_import', 'filter_add_custom_import');
 		$this->setState('filter.add_custom_import', $add_custom_import);
 
+		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
+		$this->setState('filter.type', $type);
+
 		$add_custom_button = $this->getUserStateFromRequest($this->context . '.filter.add_custom_button', 'filter_add_custom_button');
 		$this->setState('filter.add_custom_button', $add_custom_button);
 
@@ -136,10 +136,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			{
 				// convert add_fadein
 				$item->add_fadein = $this->selectionTranslation($item->add_fadein, 'add_fadein');
-				// convert type
-				$item->type = $this->selectionTranslation($item->type, 'type');
 				// convert add_custom_import
 				$item->add_custom_import = $this->selectionTranslation($item->add_custom_import, 'add_custom_import');
+				// convert type
+				$item->type = $this->selectionTranslation($item->type, 'type');
 				// convert add_custom_button
 				$item->add_custom_button = $this->selectionTranslation($item->add_custom_button, 'add_custom_button');
 				// convert add_php_ajax
@@ -172,19 +172,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_fadeinArray[$value];
 			}
 		}
-		// Array of type language strings
-		if ($name === 'type')
-		{
-			$typeArray = array(
-				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE',
-				2 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY'
-			);
-			// Now check if value is found in this array
-			if (isset($typeArray[$value]) && ComponentbuilderHelper::checkString($typeArray[$value]))
-			{
-				return $typeArray[$value];
-			}
-		}
 		// Array of add_custom_import language strings
 		if ($name === 'add_custom_import')
 		{
@@ -198,6 +185,19 @@ class ComponentbuilderModelAdmin_views extends JModelList
 				return $add_custom_importArray[$value];
 			}
 		}
+		// Array of type language strings
+		if ($name === 'type')
+		{
+			$typeArray = array(
+				1 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE',
+				2 => 'COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY'
+			);
+			// Now check if value is found in this array
+			if (isset($typeArray[$value]) && ComponentbuilderHelper::checkString($typeArray[$value]))
+			{
+				return $typeArray[$value];
+			}
+		}
 		// Array of add_custom_button language strings
 		if ($name === 'add_custom_button')
 		{
@@ -282,7 +282,7 @@ class ComponentbuilderModelAdmin_views extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.' OR a.name_list LIKE '.$search.')');
+				$query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.')');
 			}
 		}
 
@@ -291,16 +291,16 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		{
 			$query->where('a.add_fadein = ' . $db->quote($db->escape($add_fadein)));
 		}
-		// Filter by Type.
-		if ($type = $this->getState('filter.type'))
-		{
-			$query->where('a.type = ' . $db->quote($db->escape($type)));
-		}
 		// Filter by Add_custom_import.
 		if ($add_custom_import = $this->getState('filter.add_custom_import'))
 		{
 			$query->where('a.add_custom_import = ' . $db->quote($db->escape($add_custom_import)));
 		}
+		// Filter by Type.
+		if ($type = $this->getState('filter.type'))
+		{
+			$query->where('a.type = ' . $db->quote($db->escape($type)));
+		}
 		// Filter by Add_custom_button.
 		if ($add_custom_button = $this->getState('filter.add_custom_button'))
 		{
@@ -376,12 +376,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode html_import_view
 						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode php_getitems_after_all
 						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// decode php_getlistquery
@@ -408,48 +408,50 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 						// decode php_before_cancel
 						$item->php_before_cancel = base64_decode($item->php_before_cancel);
-						// decode php_batchcopy
-						$item->php_batchcopy = base64_decode($item->php_batchcopy);
+						// decode php_after_cancel
+						$item->php_after_cancel = base64_decode($item->php_after_cancel);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_batchcopy
+						$item->php_batchcopy = base64_decode($item->php_batchcopy);
 						// decode php_batchmove
 						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_before_publish
-						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_before_publish
+						$item->php_before_publish = base64_decode($item->php_before_publish);
 						// decode php_after_publish
 						$item->php_after_publish = base64_decode($item->php_after_publish);
 						// decode php_before_delete
 						$item->php_before_delete = base64_decode($item->php_before_delete);
-						// decode php_after_delete
-						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
+						// decode php_after_delete
+						$item->php_after_delete = base64_decode($item->php_after_delete);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_import_display
 						$item->php_import_display = base64_decode($item->php_import_display);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
 						// decode php_getitem
 						$item->php_getitem = base64_decode($item->php_getitem);
+						// decode php_import
+						$item->php_import = base64_decode($item->php_import);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
-						// decode php_import_ext
-						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// decode php_getitems
 						$item->php_getitems = base64_decode($item->php_getitems);
+						// decode php_import_ext
+						$item->php_import_ext = base64_decode($item->php_import_ext);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
@@ -514,8 +516,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 		$id .= ':' . $this->getState('filter.name_single');
 		$id .= ':' . $this->getState('filter.short_description');
 		$id .= ':' . $this->getState('filter.add_fadein');
-		$id .= ':' . $this->getState('filter.type');
 		$id .= ':' . $this->getState('filter.add_custom_import');
+		$id .= ':' . $this->getState('filter.type');
 		$id .= ':' . $this->getState('filter.add_custom_button');
 		$id .= ':' . $this->getState('filter.add_php_ajax');
 
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 23c476ebb..563b5181f 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -155,7 +155,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWaqfields()
+	public function getWarfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -237,13 +237,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWaqfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWarfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWaqfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWarfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWaqfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWarfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWaqfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWarfields($item->store, 'store');
 				}
 			}
 
@@ -257,7 +257,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWaqfields($value,$name)
+	public function selectionTranslationWarfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index 7feaaf4f8..a6c59cb6e 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -36,17 +36,18 @@ jform_vvvvvxyvxo_required = false;
 jform_vvvvvxzvxp_required = false;
 jform_vvvvvyavxq_required = false;
 jform_vvvvvybvxr_required = false;
-jform_vvvvvyfvxs_required = false;
-jform_vvvvvyfvxt_required = false;
-jform_vvvvvyfvxu_required = false;
-jform_vvvvvyfvxv_required = false;
-jform_vvvvvyfvxw_required = false;
-jform_vvvvvyfvxx_required = false;
-jform_vvvvvyfvxy_required = false;
-jform_vvvvvyhvxz_required = false;
-jform_vvvvvyhvya_required = false;
-jform_vvvvvyhvyb_required = false;
-jform_vvvvvyhvyc_required = false;
+jform_vvvvvycvxs_required = false;
+jform_vvvvvygvxt_required = false;
+jform_vvvvvygvxu_required = false;
+jform_vvvvvygvxv_required = false;
+jform_vvvvvygvxw_required = false;
+jform_vvvvvygvxx_required = false;
+jform_vvvvvygvxy_required = false;
+jform_vvvvvygvxz_required = false;
+jform_vvvvvyivya_required = false;
+jform_vvvvvyivyb_required = false;
+jform_vvvvvyivyc_required = false;
+jform_vvvvvyivyd_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -105,46 +106,49 @@ jQuery(document).ready(function()
 	var add_php_before_cancel_vvvvvxs = jQuery("#jform_add_php_before_cancel input[type='radio']:checked").val();
 	vvvvvxs(add_php_before_cancel_vvvvvxs);
 
-	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchcopy_vvvvvxt);
+	var add_php_after_cancel_vvvvvxt = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	vvvvvxt(add_php_after_cancel_vvvvvxt);
 
-	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxu(add_php_batchmove_vvvvvxu);
+	var add_php_batchcopy_vvvvvxu = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxu(add_php_batchcopy_vvvvvxu);
 
-	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_before_publish_vvvvvxv);
+	var add_php_batchmove_vvvvvxv = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxv(add_php_batchmove_vvvvvxv);
 
-	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxw(add_php_after_publish_vvvvvxw);
+	var add_php_before_publish_vvvvvxw = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxw(add_php_before_publish_vvvvvxw);
 
-	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_before_delete_vvvvvxx);
+	var add_php_after_publish_vvvvvxx = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxx(add_php_after_publish_vvvvvxx);
 
-	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxy(add_php_after_delete_vvvvvxy);
+	var add_php_before_delete_vvvvvxy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxy(add_php_before_delete_vvvvvxy);
 
-	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxz(add_php_document_vvvvvxz);
+	var add_php_after_delete_vvvvvxz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxz(add_php_after_delete_vvvvvxz);
 
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(add_sql_vvvvvya);
+	var add_php_document_vvvvvya = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvya(add_php_document_vvvvvya);
 
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	vvvvvyb(add_sql_vvvvvyb);
 
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
-	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyf(add_custom_import_vvvvvyf);
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
 
 	var add_custom_import_vvvvvyg = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
 	vvvvvyg(add_custom_import_vvvvvyg);
 
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	var add_custom_import_vvvvvyh = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyh(add_custom_import_vvvvvyh);
+
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);
 });
 
 // the vvvvvxb function
@@ -726,298 +730,330 @@ function vvvvvxs(add_php_before_cancel_vvvvvxs)
 }
 
 // the vvvvvxt function
-function vvvvvxt(add_php_batchcopy_vvvvvxt)
+function vvvvvxt(add_php_after_cancel_vvvvvxt)
 {
 	// set the function logic
-	if (add_php_batchcopy_vvvvvxt == 1)
+	if (add_php_after_cancel_vvvvvxt == 1)
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
-		// add required attribute to php_batchcopy field
+		jQuery('#jform_php_after_cancel-lbl').closest('.control-group').show();
+		// add required attribute to php_after_cancel field
 		if (jform_vvvvvxtvxj_required)
 		{
-			updateFieldRequired('php_batchcopy',0);
-			jQuery('#jform_php_batchcopy').prop('required','required');
-			jQuery('#jform_php_batchcopy').attr('aria-required',true);
-			jQuery('#jform_php_batchcopy').addClass('required');
+			updateFieldRequired('php_after_cancel',0);
+			jQuery('#jform_php_after_cancel').prop('required','required');
+			jQuery('#jform_php_after_cancel').attr('aria-required',true);
+			jQuery('#jform_php_after_cancel').addClass('required');
 			jform_vvvvvxtvxj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
-		// remove required attribute from php_batchcopy field
+		jQuery('#jform_php_after_cancel-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_cancel field
 		if (!jform_vvvvvxtvxj_required)
 		{
-			updateFieldRequired('php_batchcopy',1);
-			jQuery('#jform_php_batchcopy').removeAttr('required');
-			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
-			jQuery('#jform_php_batchcopy').removeClass('required');
+			updateFieldRequired('php_after_cancel',1);
+			jQuery('#jform_php_after_cancel').removeAttr('required');
+			jQuery('#jform_php_after_cancel').removeAttr('aria-required');
+			jQuery('#jform_php_after_cancel').removeClass('required');
 			jform_vvvvvxtvxj_required = true;
 		}
 	}
 }
 
 // the vvvvvxu function
-function vvvvvxu(add_php_batchmove_vvvvvxu)
+function vvvvvxu(add_php_batchcopy_vvvvvxu)
 {
 	// set the function logic
-	if (add_php_batchmove_vvvvvxu == 1)
+	if (add_php_batchcopy_vvvvvxu == 1)
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
-		// add required attribute to php_batchmove field
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
+		// add required attribute to php_batchcopy field
 		if (jform_vvvvvxuvxk_required)
 		{
-			updateFieldRequired('php_batchmove',0);
-			jQuery('#jform_php_batchmove').prop('required','required');
-			jQuery('#jform_php_batchmove').attr('aria-required',true);
-			jQuery('#jform_php_batchmove').addClass('required');
+			updateFieldRequired('php_batchcopy',0);
+			jQuery('#jform_php_batchcopy').prop('required','required');
+			jQuery('#jform_php_batchcopy').attr('aria-required',true);
+			jQuery('#jform_php_batchcopy').addClass('required');
 			jform_vvvvvxuvxk_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
-		// remove required attribute from php_batchmove field
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
+		// remove required attribute from php_batchcopy field
 		if (!jform_vvvvvxuvxk_required)
 		{
-			updateFieldRequired('php_batchmove',1);
-			jQuery('#jform_php_batchmove').removeAttr('required');
-			jQuery('#jform_php_batchmove').removeAttr('aria-required');
-			jQuery('#jform_php_batchmove').removeClass('required');
+			updateFieldRequired('php_batchcopy',1);
+			jQuery('#jform_php_batchcopy').removeAttr('required');
+			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
+			jQuery('#jform_php_batchcopy').removeClass('required');
 			jform_vvvvvxuvxk_required = true;
 		}
 	}
 }
 
 // the vvvvvxv function
-function vvvvvxv(add_php_before_publish_vvvvvxv)
+function vvvvvxv(add_php_batchmove_vvvvvxv)
 {
 	// set the function logic
-	if (add_php_before_publish_vvvvvxv == 1)
+	if (add_php_batchmove_vvvvvxv == 1)
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
-		// add required attribute to php_before_publish field
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
+		// add required attribute to php_batchmove field
 		if (jform_vvvvvxvvxl_required)
 		{
-			updateFieldRequired('php_before_publish',0);
-			jQuery('#jform_php_before_publish').prop('required','required');
-			jQuery('#jform_php_before_publish').attr('aria-required',true);
-			jQuery('#jform_php_before_publish').addClass('required');
+			updateFieldRequired('php_batchmove',0);
+			jQuery('#jform_php_batchmove').prop('required','required');
+			jQuery('#jform_php_batchmove').attr('aria-required',true);
+			jQuery('#jform_php_batchmove').addClass('required');
 			jform_vvvvvxvvxl_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_publish field
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
+		// remove required attribute from php_batchmove field
 		if (!jform_vvvvvxvvxl_required)
 		{
-			updateFieldRequired('php_before_publish',1);
-			jQuery('#jform_php_before_publish').removeAttr('required');
-			jQuery('#jform_php_before_publish').removeAttr('aria-required');
-			jQuery('#jform_php_before_publish').removeClass('required');
+			updateFieldRequired('php_batchmove',1);
+			jQuery('#jform_php_batchmove').removeAttr('required');
+			jQuery('#jform_php_batchmove').removeAttr('aria-required');
+			jQuery('#jform_php_batchmove').removeClass('required');
 			jform_vvvvvxvvxl_required = true;
 		}
 	}
 }
 
 // the vvvvvxw function
-function vvvvvxw(add_php_after_publish_vvvvvxw)
+function vvvvvxw(add_php_before_publish_vvvvvxw)
 {
 	// set the function logic
-	if (add_php_after_publish_vvvvvxw == 1)
+	if (add_php_before_publish_vvvvvxw == 1)
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
-		// add required attribute to php_after_publish field
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
+		// add required attribute to php_before_publish field
 		if (jform_vvvvvxwvxm_required)
 		{
-			updateFieldRequired('php_after_publish',0);
-			jQuery('#jform_php_after_publish').prop('required','required');
-			jQuery('#jform_php_after_publish').attr('aria-required',true);
-			jQuery('#jform_php_after_publish').addClass('required');
+			updateFieldRequired('php_before_publish',0);
+			jQuery('#jform_php_before_publish').prop('required','required');
+			jQuery('#jform_php_before_publish').attr('aria-required',true);
+			jQuery('#jform_php_before_publish').addClass('required');
 			jform_vvvvvxwvxm_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_publish field
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_publish field
 		if (!jform_vvvvvxwvxm_required)
 		{
-			updateFieldRequired('php_after_publish',1);
-			jQuery('#jform_php_after_publish').removeAttr('required');
-			jQuery('#jform_php_after_publish').removeAttr('aria-required');
-			jQuery('#jform_php_after_publish').removeClass('required');
+			updateFieldRequired('php_before_publish',1);
+			jQuery('#jform_php_before_publish').removeAttr('required');
+			jQuery('#jform_php_before_publish').removeAttr('aria-required');
+			jQuery('#jform_php_before_publish').removeClass('required');
 			jform_vvvvvxwvxm_required = true;
 		}
 	}
 }
 
 // the vvvvvxx function
-function vvvvvxx(add_php_before_delete_vvvvvxx)
+function vvvvvxx(add_php_after_publish_vvvvvxx)
 {
 	// set the function logic
-	if (add_php_before_delete_vvvvvxx == 1)
+	if (add_php_after_publish_vvvvvxx == 1)
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
-		// add required attribute to php_before_delete field
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
+		// add required attribute to php_after_publish field
 		if (jform_vvvvvxxvxn_required)
 		{
-			updateFieldRequired('php_before_delete',0);
-			jQuery('#jform_php_before_delete').prop('required','required');
-			jQuery('#jform_php_before_delete').attr('aria-required',true);
-			jQuery('#jform_php_before_delete').addClass('required');
+			updateFieldRequired('php_after_publish',0);
+			jQuery('#jform_php_after_publish').prop('required','required');
+			jQuery('#jform_php_after_publish').attr('aria-required',true);
+			jQuery('#jform_php_after_publish').addClass('required');
 			jform_vvvvvxxvxn_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_delete field
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_publish field
 		if (!jform_vvvvvxxvxn_required)
 		{
-			updateFieldRequired('php_before_delete',1);
-			jQuery('#jform_php_before_delete').removeAttr('required');
-			jQuery('#jform_php_before_delete').removeAttr('aria-required');
-			jQuery('#jform_php_before_delete').removeClass('required');
+			updateFieldRequired('php_after_publish',1);
+			jQuery('#jform_php_after_publish').removeAttr('required');
+			jQuery('#jform_php_after_publish').removeAttr('aria-required');
+			jQuery('#jform_php_after_publish').removeClass('required');
 			jform_vvvvvxxvxn_required = true;
 		}
 	}
 }
 
 // the vvvvvxy function
-function vvvvvxy(add_php_after_delete_vvvvvxy)
+function vvvvvxy(add_php_before_delete_vvvvvxy)
 {
 	// set the function logic
-	if (add_php_after_delete_vvvvvxy == 1)
+	if (add_php_before_delete_vvvvvxy == 1)
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
-		// add required attribute to php_after_delete field
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
+		// add required attribute to php_before_delete field
 		if (jform_vvvvvxyvxo_required)
 		{
-			updateFieldRequired('php_after_delete',0);
-			jQuery('#jform_php_after_delete').prop('required','required');
-			jQuery('#jform_php_after_delete').attr('aria-required',true);
-			jQuery('#jform_php_after_delete').addClass('required');
+			updateFieldRequired('php_before_delete',0);
+			jQuery('#jform_php_before_delete').prop('required','required');
+			jQuery('#jform_php_before_delete').attr('aria-required',true);
+			jQuery('#jform_php_before_delete').addClass('required');
 			jform_vvvvvxyvxo_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_delete field
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_delete field
 		if (!jform_vvvvvxyvxo_required)
 		{
-			updateFieldRequired('php_after_delete',1);
-			jQuery('#jform_php_after_delete').removeAttr('required');
-			jQuery('#jform_php_after_delete').removeAttr('aria-required');
-			jQuery('#jform_php_after_delete').removeClass('required');
+			updateFieldRequired('php_before_delete',1);
+			jQuery('#jform_php_before_delete').removeAttr('required');
+			jQuery('#jform_php_before_delete').removeAttr('aria-required');
+			jQuery('#jform_php_before_delete').removeClass('required');
 			jform_vvvvvxyvxo_required = true;
 		}
 	}
 }
 
 // the vvvvvxz function
-function vvvvvxz(add_php_document_vvvvvxz)
+function vvvvvxz(add_php_after_delete_vvvvvxz)
 {
 	// set the function logic
-	if (add_php_document_vvvvvxz == 1)
+	if (add_php_after_delete_vvvvvxz == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
+		// add required attribute to php_after_delete field
 		if (jform_vvvvvxzvxp_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_after_delete',0);
+			jQuery('#jform_php_after_delete').prop('required','required');
+			jQuery('#jform_php_after_delete').attr('aria-required',true);
+			jQuery('#jform_php_after_delete').addClass('required');
 			jform_vvvvvxzvxp_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_delete field
 		if (!jform_vvvvvxzvxp_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_after_delete',1);
+			jQuery('#jform_php_after_delete').removeAttr('required');
+			jQuery('#jform_php_after_delete').removeAttr('aria-required');
+			jQuery('#jform_php_after_delete').removeClass('required');
 			jform_vvvvvxzvxp_required = true;
 		}
 	}
 }
 
 // the vvvvvya function
-function vvvvvya(add_sql_vvvvvya)
+function vvvvvya(add_php_document_vvvvvya)
 {
 	// set the function logic
-	if (add_sql_vvvvvya == 1)
+	if (add_php_document_vvvvvya == 1)
 	{
-		jQuery('#jform_source').closest('.control-group').show();
-		// add required attribute to source field
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		// add required attribute to php_document field
 		if (jform_vvvvvyavxq_required)
 		{
-			updateFieldRequired('source',0);
-			jQuery('#jform_source').prop('required','required');
-			jQuery('#jform_source').attr('aria-required',true);
-			jQuery('#jform_source').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyavxq_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_source').closest('.control-group').hide();
-		// remove required attribute from source field
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		// remove required attribute from php_document field
 		if (!jform_vvvvvyavxq_required)
 		{
-			updateFieldRequired('source',1);
-			jQuery('#jform_source').removeAttr('required');
-			jQuery('#jform_source').removeAttr('aria-required');
-			jQuery('#jform_source').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyavxq_required = true;
 		}
 	}
 }
 
 // the vvvvvyb function
-function vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb)
+function vvvvvyb(add_sql_vvvvvyb)
 {
 	// set the function logic
-	if (source_vvvvvyb == 2 && add_sql_vvvvvyb == 1)
+	if (add_sql_vvvvvyb == 1)
+	{
+		jQuery('#jform_source').closest('.control-group').show();
+		// add required attribute to source field
+		if (jform_vvvvvybvxr_required)
+		{
+			updateFieldRequired('source',0);
+			jQuery('#jform_source').prop('required','required');
+			jQuery('#jform_source').attr('aria-required',true);
+			jQuery('#jform_source').addClass('required');
+			jform_vvvvvybvxr_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_source').closest('.control-group').hide();
+		// remove required attribute from source field
+		if (!jform_vvvvvybvxr_required)
+		{
+			updateFieldRequired('source',1);
+			jQuery('#jform_source').removeAttr('required');
+			jQuery('#jform_source').removeAttr('aria-required');
+			jQuery('#jform_source').removeClass('required');
+			jform_vvvvvybvxr_required = true;
+		}
+	}
+}
+
+// the vvvvvyc function
+function vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc)
+{
+	// set the function logic
+	if (source_vvvvvyc == 2 && add_sql_vvvvvyc == 1)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvybvxr_required)
+		if (jform_vvvvvycvxs_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvybvxr_required = false;
+			jform_vvvvvycvxs_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvybvxr_required)
+		if (!jform_vvvvvycvxs_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvybvxr_required = true;
+			jform_vvvvvycvxs_required = true;
 		}
 	}
 }
 
-// the vvvvvyd function
-function vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd)
+// the vvvvvye function
+function vvvvvye(source_vvvvvye,add_sql_vvvvvye)
 {
 	// set the function logic
-	if (source_vvvvvyd == 1 && add_sql_vvvvvyd == 1)
+	if (source_vvvvvye == 1 && add_sql_vvvvvye == 1)
 	{
 		jQuery('#jform_addtables-lbl').closest('.control-group').show();
 	}
@@ -1027,165 +1063,165 @@ function vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd)
 	}
 }
 
-// the vvvvvyf function
-function vvvvvyf(add_custom_import_vvvvvyf)
+// the vvvvvyg function
+function vvvvvyg(add_custom_import_vvvvvyg)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyf == 1)
+	if (add_custom_import_vvvvvyg == 1)
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').show();
 		// add required attribute to html_import_view field
-		if (jform_vvvvvyfvxs_required)
+		if (jform_vvvvvygvxt_required)
 		{
 			updateFieldRequired('html_import_view',0);
 			jQuery('#jform_html_import_view').prop('required','required');
 			jQuery('#jform_html_import_view').attr('aria-required',true);
 			jQuery('#jform_html_import_view').addClass('required');
-			jform_vvvvvyfvxs_required = false;
+			jform_vvvvvygvxt_required = false;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').show();
 		jQuery('#jform_php_import_display').closest('.control-group').show();
 		// add required attribute to php_import_display field
-		if (jform_vvvvvyfvxt_required)
+		if (jform_vvvvvygvxu_required)
 		{
 			updateFieldRequired('php_import_display',0);
 			jQuery('#jform_php_import_display').prop('required','required');
 			jQuery('#jform_php_import_display').attr('aria-required',true);
 			jQuery('#jform_php_import_display').addClass('required');
-			jform_vvvvvyfvxt_required = false;
+			jform_vvvvvygvxu_required = false;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').show();
 		// add required attribute to php_import_ext field
-		if (jform_vvvvvyfvxu_required)
+		if (jform_vvvvvygvxv_required)
 		{
 			updateFieldRequired('php_import_ext',0);
 			jQuery('#jform_php_import_ext').prop('required','required');
 			jQuery('#jform_php_import_ext').attr('aria-required',true);
 			jQuery('#jform_php_import_ext').addClass('required');
-			jform_vvvvvyfvxu_required = false;
+			jform_vvvvvygvxv_required = false;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		// add required attribute to php_import_headers field
-		if (jform_vvvvvyfvxv_required)
+		if (jform_vvvvvygvxw_required)
 		{
 			updateFieldRequired('php_import_headers',0);
 			jQuery('#jform_php_import_headers').prop('required','required');
 			jQuery('#jform_php_import_headers').attr('aria-required',true);
 			jQuery('#jform_php_import_headers').addClass('required');
-			jform_vvvvvyfvxv_required = false;
+			jform_vvvvvygvxw_required = false;
 		}
 		jQuery('#jform_php_import').closest('.control-group').show();
 		// add required attribute to php_import field
-		if (jform_vvvvvyfvxw_required)
+		if (jform_vvvvvygvxx_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvvyfvxw_required = false;
+			jform_vvvvvygvxx_required = false;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').show();
 		// add required attribute to php_import_save field
-		if (jform_vvvvvyfvxx_required)
+		if (jform_vvvvvygvxy_required)
 		{
 			updateFieldRequired('php_import_save',0);
 			jQuery('#jform_php_import_save').prop('required','required');
 			jQuery('#jform_php_import_save').attr('aria-required',true);
 			jQuery('#jform_php_import_save').addClass('required');
-			jform_vvvvvyfvxx_required = false;
+			jform_vvvvvygvxy_required = false;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
 		// add required attribute to php_import_setdata field
-		if (jform_vvvvvyfvxy_required)
+		if (jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_import_setdata',0);
 			jQuery('#jform_php_import_setdata').prop('required','required');
 			jQuery('#jform_php_import_setdata').attr('aria-required',true);
 			jQuery('#jform_php_import_setdata').addClass('required');
-			jform_vvvvvyfvxy_required = false;
+			jform_vvvvvygvxz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').hide();
 		// remove required attribute from html_import_view field
-		if (!jform_vvvvvyfvxs_required)
+		if (!jform_vvvvvygvxt_required)
 		{
 			updateFieldRequired('html_import_view',1);
 			jQuery('#jform_html_import_view').removeAttr('required');
 			jQuery('#jform_html_import_view').removeAttr('aria-required');
 			jQuery('#jform_html_import_view').removeClass('required');
-			jform_vvvvvyfvxs_required = true;
+			jform_vvvvvygvxt_required = true;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').hide();
 		jQuery('#jform_php_import_display').closest('.control-group').hide();
 		// remove required attribute from php_import_display field
-		if (!jform_vvvvvyfvxt_required)
+		if (!jform_vvvvvygvxu_required)
 		{
 			updateFieldRequired('php_import_display',1);
 			jQuery('#jform_php_import_display').removeAttr('required');
 			jQuery('#jform_php_import_display').removeAttr('aria-required');
 			jQuery('#jform_php_import_display').removeClass('required');
-			jform_vvvvvyfvxt_required = true;
+			jform_vvvvvygvxu_required = true;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').hide();
 		// remove required attribute from php_import_ext field
-		if (!jform_vvvvvyfvxu_required)
+		if (!jform_vvvvvygvxv_required)
 		{
 			updateFieldRequired('php_import_ext',1);
 			jQuery('#jform_php_import_ext').removeAttr('required');
 			jQuery('#jform_php_import_ext').removeAttr('aria-required');
 			jQuery('#jform_php_import_ext').removeClass('required');
-			jform_vvvvvyfvxu_required = true;
+			jform_vvvvvygvxv_required = true;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		// remove required attribute from php_import_headers field
-		if (!jform_vvvvvyfvxv_required)
+		if (!jform_vvvvvygvxw_required)
 		{
 			updateFieldRequired('php_import_headers',1);
 			jQuery('#jform_php_import_headers').removeAttr('required');
 			jQuery('#jform_php_import_headers').removeAttr('aria-required');
 			jQuery('#jform_php_import_headers').removeClass('required');
-			jform_vvvvvyfvxv_required = true;
+			jform_vvvvvygvxw_required = true;
 		}
 		jQuery('#jform_php_import').closest('.control-group').hide();
 		// remove required attribute from php_import field
-		if (!jform_vvvvvyfvxw_required)
+		if (!jform_vvvvvygvxx_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvvyfvxw_required = true;
+			jform_vvvvvygvxx_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
 		// remove required attribute from php_import_save field
-		if (!jform_vvvvvyfvxx_required)
+		if (!jform_vvvvvygvxy_required)
 		{
 			updateFieldRequired('php_import_save',1);
 			jQuery('#jform_php_import_save').removeAttr('required');
 			jQuery('#jform_php_import_save').removeAttr('aria-required');
 			jQuery('#jform_php_import_save').removeClass('required');
-			jform_vvvvvyfvxx_required = true;
+			jform_vvvvvygvxy_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
 		// remove required attribute from php_import_setdata field
-		if (!jform_vvvvvyfvxy_required)
+		if (!jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_import_setdata',1);
 			jQuery('#jform_php_import_setdata').removeAttr('required');
 			jQuery('#jform_php_import_setdata').removeAttr('aria-required');
 			jQuery('#jform_php_import_setdata').removeClass('required');
-			jform_vvvvvyfvxy_required = true;
+			jform_vvvvvygvxz_required = true;
 		}
 	}
 }
 
-// the vvvvvyg function
-function vvvvvyg(add_custom_import_vvvvvyg)
+// the vvvvvyh function
+function vvvvvyh(add_custom_import_vvvvvyh)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyg == 0)
+	if (add_custom_import_vvvvvyh == 0)
 	{
 		jQuery('.note_beginner_import').closest('.control-group').show();
 	}
@@ -1195,52 +1231,52 @@ function vvvvvyg(add_custom_import_vvvvvyg)
 	}
 }
 
-// the vvvvvyh function
-function vvvvvyh(add_custom_button_vvvvvyh)
+// the vvvvvyi function
+function vvvvvyi(add_custom_button_vvvvvyi)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyh == 1)
+	if (add_custom_button_vvvvvyi == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvyhvxz_required)
+		if (jform_vvvvvyivya_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyhvxz_required = false;
+			jform_vvvvvyivya_required = false;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').show();
 		// add required attribute to php_controller_list field
-		if (jform_vvvvvyhvya_required)
+		if (jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('php_controller_list',0);
 			jQuery('#jform_php_controller_list').prop('required','required');
 			jQuery('#jform_php_controller_list').attr('aria-required',true);
 			jQuery('#jform_php_controller_list').addClass('required');
-			jform_vvvvvyhvya_required = false;
+			jform_vvvvvyivyb_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvyhvyb_required)
+		if (jform_vvvvvyivyc_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyhvyb_required = false;
+			jform_vvvvvyivyc_required = false;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').show();
 		// add required attribute to php_model_list field
-		if (jform_vvvvvyhvyc_required)
+		if (jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_model_list',0);
 			jQuery('#jform_php_model_list').prop('required','required');
 			jQuery('#jform_php_model_list').attr('aria-required',true);
 			jQuery('#jform_php_model_list').addClass('required');
-			jform_vvvvvyhvyc_required = false;
+			jform_vvvvvyivyd_required = false;
 		}
 	}
 	else
@@ -1248,43 +1284,43 @@ function vvvvvyh(add_custom_button_vvvvvyh)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvyhvxz_required)
+		if (!jform_vvvvvyivya_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyhvxz_required = true;
+			jform_vvvvvyivya_required = true;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller_list field
-		if (!jform_vvvvvyhvya_required)
+		if (!jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('php_controller_list',1);
 			jQuery('#jform_php_controller_list').removeAttr('required');
 			jQuery('#jform_php_controller_list').removeAttr('aria-required');
 			jQuery('#jform_php_controller_list').removeClass('required');
-			jform_vvvvvyhvya_required = true;
+			jform_vvvvvyivyb_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvyhvyb_required)
+		if (!jform_vvvvvyivyc_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyhvyb_required = true;
+			jform_vvvvvyivyc_required = true;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model_list field
-		if (!jform_vvvvvyhvyc_required)
+		if (!jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_model_list',1);
 			jQuery('#jform_php_model_list').removeAttr('required');
 			jQuery('#jform_php_model_list').removeAttr('aria-required');
 			jQuery('#jform_php_model_list').removeClass('required');
-			jform_vvvvvyhvyc_required = true;
+			jform_vvvvvyivyd_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index f140bd015..b2c2bdd88 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -185,20 +185,22 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
+		<!-- Name_list Field. Type: Text. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_getitems_after_all"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
+			type="text"
+			name="name_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_DESCRIPTION"
+			class="inputbox"
+			readonly="false"
+			disabled="false"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_MESSAGE"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_HINT"
+		/>
 		<!-- Icon Field. Type: Media. (joomla) -->
 		<field
 			type="media"
@@ -207,11 +209,11 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+			name="add_php_before_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -265,288 +267,6 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="html_import_view"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
-			required="true"
-		/>
-		<!-- Mysql_table_engine Field. Type: List. (joomla) -->
-		<field
-			type="list"
-			name="mysql_table_engine"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION"
-			class="list_class bestview"
-			multiple="false"
-			filter="CMD"
-			required="true"
-			default="InnoDB">
-			<!-- Option Set. -->
-			<option value="MyISAM">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM</option>
-			<option value="InnoDB">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_INNODB</option>
-			<option value="MEMORY">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_MEMORY</option>
-			<option value="ARCHIVE">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE</option>
-			<option value="PERFORMANCE_SCHEMA">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_PERFORMANCE_SCHEMA</option>
-		</field>
-		<!-- Type Field. Type: List. (joomla) -->
-		<field
-			type="list"
-			name="type"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION"
-			class="btn-group"
-			filter="INT"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY</option>
-		</field>
-		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
-		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
-			required="true"
-		/>
-		<!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_permissions" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_permissions" />
-		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_getlistquery"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Addpermissions Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="addpermissions"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION"
-			icon="list">
-			<form hidden="true" name="list_addpermissions_modal" repeat="true">
-				<!-- Action Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="action"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					filter="CMD"
-					required="true"
-					default="">
-					<!-- Option Set. -->
-					<option value="core.edit">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT</option>
-					<option value="core.edit.own">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN</option>
-					<option value="core.edit.state">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE</option>
-					<option value="core.edit.access">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITACCESS</option>
-					<option value="core.edit.created_by">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY</option>
-					<option value="core.edit.created">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED</option>
-					<option value="core.create">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE</option>
-					<option value="core.delete">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE</option>
-					<option value="view.edit">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDIT</option>
-					<option value="view.edit.own">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN</option>
-					<option value="view.edit.state">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITSTATE</option>
-					<option value="view.edit.access">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITACCESS</option>
-					<option value="view.edit.created_by">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY</option>
-					<option value="view.edit.created">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED</option>
-					<option value="view.create">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWCREATE</option>
-					<option value="view.delete">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWDELETE</option>
-					<option value="view.access">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS</option>
-				</field>
-				<!-- Implementation Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="implementation"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					filter="INT"
-					default="1">
-					<!-- Option Set. -->
-					<option value="1">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_EACH_RECORD</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_THE_WHOLE_VIEW</option>
-					<option value="3">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_BOTH</option>
-				</field>
-			</form>
-		</field>
-		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_before_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
-		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_postsavehook"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Addtabs Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="addtabs"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION"
-			default=""
-			icon="list">
-			<form hidden="true" name="list_addtabs_modal" repeat="true">
-				<!-- Name Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="name"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION"
-					class="text_area"
-					readonly="false"
-					disabled="false"
-					required="true"
-					filter="STRING"
-					message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT"
-				/>
-			</form>
-		</field>
-		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_custom_tabs_note Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_custom_tabs_note" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CUSTOM_TABS_NOTE_DESCRIPTION" heading="h5" class="alert alert-success note_custom_tabs_note" />
 		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -561,154 +281,6 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" />
-		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Addlinked_views Field. Type: Subform. (joomla) -->
-		<field
-			type="subform"
-			name="addlinked_views"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
-			icon="list">
-			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
-				<!-- Adminview Field. Type: Adminviews. (custom) -->
-				<field
-					type="adminviews"
-					name="adminview"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
-					class="fieldMedium"
-					multiple="false"
-					default=""
-					required="true"
-					button="false"
-				/>
-				<!-- Tab Field. Type: Integer. (joomla) -->
-				<field
-					type="integer"
-					name="tab"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL"
-					default="1"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION"
-					class="fieldSmall"
-					first="1"
-					last="14"
-					step="1"
-				/>
-				<!-- Key Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="key"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION"
-					class="text_area"
-					readonly="false"
-					disabled="false"
-					required="true"
-					filter="WORD"
-					message="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT"
-				/>
-				<!-- Parentkey Field. Type: Text. (joomla) -->
-				<field
-					type="text"
-					name="parentkey"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_LABEL"
-					size="40"
-					maxlength="150"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_DESCRIPTION"
-					class="text_area"
-					readonly="false"
-					disabled="false"
-					required="true"
-					filter="WORD"
-					message="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_MESSAGE"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT"
-				/>
-				<!-- Addnew Field. Type: List. (joomla) -->
-				<field
-					type="list"
-					name="addnew"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_DESCRIPTION"
-					class="list_class"
-					multiple="false"
-					filter="int"
-					default="0">
-					<!-- Option Set. -->
-					<option value="0">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_NONE</option>
-					<option value="1">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON</option>
-					<option value="2">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON</option>
-					<option value="3">
-						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON</option>
-				</field>
-			</form>
-		</field>
-		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-info note_create_edit_notice" />
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Alias_builder_type Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="alias_builder_type"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="1">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM</option>
-		</field>
 		<!-- Mysql_table_collate Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -1166,8 +738,64 @@
 			<option value="gb18030_unicode_520_ci">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_UNICODE_FIVE_HUNDRED_AND_TWENTY_CI_CHARSET_GBEIGHTEEN_THOUSAND_AND_THIRTY</option>
 		</field>
-		<!-- Note_alias_builder_custom Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_alias_builder_custom" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_custom" showon="alias_builder_type:2" />
+		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_before_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_custom_import"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_document"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Type Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="type"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION"
+			class="btn-group"
+			filter="INT"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY</option>
+		</field>
 		<!-- Addtables Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -1203,32 +831,11 @@
 				/>
 			</form>
 		</field>
-		<!-- Note_alias_builder_default Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_alias_builder_default" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_default" showon="alias_builder_type:1" />
-		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
-			type="radio"
-			name="add_custom_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Alias_builder Field. Type: Aliasbuilder. (custom) -->
-		<field
-			type="aliasbuilder"
-			name="alias_builder"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_DESCRIPTION"
-			class="list_class fieldFull"
-			multiple="true"
-			showon="alias_builder_type:2"
+			type="hidden"
+			name="not_required"
+			default="[]"
 		/>
 		<!-- Php_import_headers Field. Type: Textarea. (joomla) -->
 		<field
@@ -1243,23 +850,416 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
 			required="true"
 		/>
+		<!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_permissions" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_permissions" />
+		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_getlistquery"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Addpermissions Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="addpermissions"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION"
+			icon="list">
+			<form hidden="true" name="list_addpermissions_modal" repeat="true">
+				<!-- Action Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="action"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					filter="CMD"
+					required="true"
+					default="">
+					<!-- Option Set. -->
+					<option value="core.edit">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT</option>
+					<option value="core.edit.own">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN</option>
+					<option value="core.edit.state">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE</option>
+					<option value="core.edit.access">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITACCESS</option>
+					<option value="core.edit.created_by">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY</option>
+					<option value="core.edit.created">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED</option>
+					<option value="core.create">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE</option>
+					<option value="core.delete">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE</option>
+					<option value="view.edit">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDIT</option>
+					<option value="view.edit.own">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN</option>
+					<option value="view.edit.state">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITSTATE</option>
+					<option value="view.edit.access">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITACCESS</option>
+					<option value="view.edit.created_by">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY</option>
+					<option value="view.edit.created">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED</option>
+					<option value="view.create">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWCREATE</option>
+					<option value="view.delete">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWDELETE</option>
+					<option value="view.access">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS</option>
+				</field>
+				<!-- Implementation Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="implementation"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					filter="INT"
+					default="1">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_EACH_RECORD</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_IN_RELATION_TO_THE_WHOLE_VIEW</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_BOTH</option>
+				</field>
+			</form>
+		</field>
+		<!-- Add_php_before_save Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_before_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_SAVE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
+		<!-- Add_php_postsavehook Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_postsavehook"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_POSTSAVEHOOK_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Addtabs Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="addtabs"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION"
+			default=""
+			icon="list">
+			<form hidden="true" name="list_addtabs_modal" repeat="true">
+				<!-- Name Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="name"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="true"
+					filter="STRING"
+					message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_MESSAGE"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT"
+				/>
+			</form>
+		</field>
+		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_allowedit"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_custom_tabs_note Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_custom_tabs_note" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CUSTOM_TABS_NOTE_DESCRIPTION" heading="h5" class="alert alert-success note_custom_tabs_note" />
+		<!-- Add_php_after_cancel Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_after_cancel"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_CANCEL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" />
+		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_batchmove"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Addlinked_views Field. Type: Subform. (joomla) -->
+		<field
+			type="subform"
+			name="addlinked_views"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
+			icon="list">
+			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
+				<!-- Adminview Field. Type: Adminviews. (custom) -->
+				<field
+					type="adminviews"
+					name="adminview"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_DESCRIPTION"
+					class="fieldMedium"
+					multiple="false"
+					default=""
+					required="true"
+					button="false"
+				/>
+				<!-- Tab Field. Type: Integer. (joomla) -->
+				<field
+					type="integer"
+					name="tab"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL"
+					default="1"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION"
+					class="fieldSmall"
+					first="1"
+					last="14"
+					step="1"
+				/>
+				<!-- Key Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="key"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="true"
+					filter="WORD"
+					message="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_MESSAGE"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT"
+				/>
+				<!-- Parentkey Field. Type: Text. (joomla) -->
+				<field
+					type="text"
+					name="parentkey"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_LABEL"
+					size="40"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="true"
+					filter="WORD"
+					message="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_MESSAGE"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT"
+				/>
+				<!-- Addnew Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="addnew"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					filter="int"
+					default="0">
+					<!-- Option Set. -->
+					<option value="0">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_NONE</option>
+					<option value="1">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_BUTTON</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_NEW_CLOSE_BUTTON</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_NEW_CLOSE_BUTTON</option>
+				</field>
+			</form>
+		</field>
+		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_after_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-info note_create_edit_notice" />
+		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_after_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Alias_builder_type Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="alias_builder_type"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_DEFAULT</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM</option>
+		</field>
+		<!-- Mysql_table_engine Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="mysql_table_engine"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL_TABLE_ENGINE_DESCRIPTION"
+			class="list_class bestview"
+			multiple="false"
+			filter="CMD"
+			required="true"
+			default="InnoDB">
+			<!-- Option Set. -->
+			<option value="MyISAM">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_MYISAM</option>
+			<option value="InnoDB">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_INNODB</option>
+			<option value="MEMORY">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_MEMORY</option>
+			<option value="ARCHIVE">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE</option>
+			<option value="PERFORMANCE_SCHEMA">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_PERFORMANCE_SCHEMA</option>
+		</field>
+		<!-- Note_alias_builder_custom Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_alias_builder_custom" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_custom" showon="alias_builder_type:2" />
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Note_alias_builder_default Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_alias_builder_default" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_default" showon="alias_builder_type:1" />
+		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
+		<!-- Alias_builder Field. Type: Aliasbuilder. (custom) -->
+		<field
+			type="aliasbuilder"
+			name="alias_builder"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_DESCRIPTION"
+			class="list_class fieldFull"
+			multiple="true"
+			showon="alias_builder_type:2"
+		/>
+		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="html_import_view"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+			required="true"
+		/>
 		<!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_buttons" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION" class="note_create_edit_buttons" />
-		<!-- Name_list Field. Type: Text. (joomla) -->
+		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
 		<field
-			type="text"
-			name="name_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL"
-			size="40"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_DESCRIPTION"
-			class="inputbox"
-			readonly="false"
-			disabled="false"
+			type="textarea"
+			name="php_import_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
 			required="true"
-			filter="STRING"
-			message="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_MESSAGE"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_HINT"
 		/>
 		<!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_display" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION" class="note_create_edit_display" />
@@ -1554,12 +1554,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
+		<!-- Php_after_cancel Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
+			name="php_after_cancel"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_CANCEL_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1588,12 +1588,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
+		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
+			name="php_batchcopy"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1619,12 +1619,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
+			name="php_batchmove"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1653,12 +1653,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
+			name="php_before_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1684,12 +1684,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
+			name="php_after_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -2209,12 +2209,12 @@
 				</field>
 			</form>
 		</field>
-		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
+			name="php_before_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -2243,6 +2243,40 @@
 			required="false"
 			validate="code"
 		/>
+		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_after_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_model"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
 		<!-- Php_document Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -2260,12 +2294,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_model"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+			name="php_controller_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -2372,16 +2406,16 @@
 			<option value="gb18030">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINA_NATIONAL_STANDARD_GBEIGHTEEN_THOUSAND_AND_THIRTY_MOST_SUITABLE_COLLATION_GBEIGHTEEN_THOUSAND_AND_THIRTY_CHINESE_CI</option>
 		</field>
-		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
+		<!-- Php_model_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_controller_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
+			name="php_model_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
-			cols="15"
-			rows="30"
+			cols="30"
+			rows="15"
 			buttons="no"
 			syntax="php"
 			editor="codemirror|none"
@@ -2411,37 +2445,6 @@
 			<option value="COMPRESSED">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_COMPRESSED</option>
 		</field>
-		<!-- Php_model_list Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_model_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LIST_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="30"
-			rows="15"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
-		<!-- Source Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="source"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE_LABEL"
-			class="btn-group btn-group-yesno"
-			default=""
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE</option>
-			<option value="2">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP</option>
-		</field>
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -2456,19 +2459,20 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<!-- Source Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
-			required="true"
-		/>
+			type="radio"
+			name="source"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE_LABEL"
+			class="btn-group btn-group-yesno"
+			default=""
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP</option>
+		</field>
 		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -2486,8 +2490,19 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
+		<!-- Sql Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="sql"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
+			required="true"
+		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -2628,19 +2643,8 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_display"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
-			required="true"
-		/>
+		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
 		<!-- Add_php_getitem Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -2655,17 +2659,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
+			name="php_import_display"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
 			required="true"
 		/>
 		<!-- Php_getitem Field. Type: Editor. (joomla) -->
@@ -2685,17 +2689,17 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
+		<!-- Php_import Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_setdata"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
+			name="php_import"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
 			required="true"
 		/>
 		<!-- Add_php_getitems Field. Type: Radio. (joomla) -->
@@ -2712,17 +2716,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_ext"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			name="php_import_setdata"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
 			required="true"
 		/>
 		<!-- Php_getitems Field. Type: Editor. (joomla) -->
@@ -2742,6 +2746,33 @@
 			required="true"
 			validate="code"
 		/>
+		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_ext"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			required="true"
+		/>
+		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_getitems_after_all"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->
diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js
index 74509a281..892068a37 100644
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyivyd_required = false;
 jform_vvvvvyjvye_required = false;
 jform_vvvvvykvyf_required = false;
 jform_vvvvvylvyg_required = false;
@@ -17,294 +16,295 @@ jform_vvvvvymvyh_required = false;
 jform_vvvvvynvyi_required = false;
 jform_vvvvvyovyj_required = false;
 jform_vvvvvypvyk_required = false;
-jform_vvvvvypvyl_required = false;
+jform_vvvvvyqvyl_required = false;
 jform_vvvvvyqvym_required = false;
 jform_vvvvvyrvyn_required = false;
+jform_vvvvvysvyo_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyj(add_php_view_vvvvvyj);
 
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyl(add_php_jview_vvvvvyl);
 
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvym(add_php_document_vvvvvym);
 
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyn(add_css_document_vvvvvyn);
 
-	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_javascript_file_vvvvvyn);
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
-	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_js_document_vvvvvyo);
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyp(add_js_document_vvvvvyp);
 
-	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyp(add_custom_button_vvvvvyp);
+	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyq(add_custom_button_vvvvvyq);
 
-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	var add_css_vvvvvyr = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyr(add_css_vvvvvyr);
 
-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	var add_php_ajax_vvvvvys = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvys(add_php_ajax_vvvvvys);
 });
 
-// the vvvvvyi function
-function vvvvvyi(add_php_view_vvvvvyi)
+// the vvvvvyj function
+function vvvvvyj(add_php_view_vvvvvyj)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyi == 1)
+	if (add_php_view_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvyivyd_required)
+		if (jform_vvvvvyjvye_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyivyd_required = false;
+			jform_vvvvvyjvye_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvyivyd_required)
+		if (!jform_vvvvvyjvye_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyivyd_required = true;
-		}
-	}
-}
-
-// the vvvvvyj function
-function vvvvvyj(add_php_jview_display_vvvvvyj)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyj == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvyjvye_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvyjvye_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvyjvye_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyjvye_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_php_jview_vvvvvyk)
+function vvvvvyk(add_php_jview_display_vvvvvyk)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyk == 1)
+	if (add_php_jview_display_vvvvvyk == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
+		// add required attribute to php_jview_display field
 		if (jform_vvvvvykvyf_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvykvyf_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview_display field
 		if (!jform_vvvvvykvyf_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvykvyf_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_php_document_vvvvvyl)
+function vvvvvyl(add_php_jview_vvvvvyl)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyl == 1)
+	if (add_php_jview_vvvvvyl == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		// add required attribute to php_jview field
 		if (jform_vvvvvylvyg_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvylvyg_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview field
 		if (!jform_vvvvvylvyg_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvylvyg_required = true;
 		}
 	}
 }
 
 // the vvvvvym function
-function vvvvvym(add_css_document_vvvvvym)
+function vvvvvym(add_php_document_vvvvvym)
 {
 	// set the function logic
-	if (add_css_document_vvvvvym == 1)
+	if (add_php_document_vvvvvym == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		// add required attribute to php_document field
 		if (jform_vvvvvymvyh_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvymvyh_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		// remove required attribute from php_document field
 		if (!jform_vvvvvymvyh_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvymvyh_required = true;
 		}
 	}
 }
 
 // the vvvvvyn function
-function vvvvvyn(add_javascript_file_vvvvvyn)
+function vvvvvyn(add_css_document_vvvvvyn)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyn == 1)
+	if (add_css_document_vvvvvyn == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		// add required attribute to css_document field
 		if (jform_vvvvvynvyi_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvynvyi_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		// remove required attribute from css_document field
 		if (!jform_vvvvvynvyi_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvynvyi_required = true;
 		}
 	}
 }
 
 // the vvvvvyo function
-function vvvvvyo(add_js_document_vvvvvyo)
+function vvvvvyo(add_javascript_file_vvvvvyo)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyo == 1)
+	if (add_javascript_file_vvvvvyo == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		// add required attribute to javascript_file field
 		if (jform_vvvvvyovyj_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyovyj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_file field
 		if (!jform_vvvvvyovyj_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyovyj_required = true;
 		}
 	}
 }
 
 // the vvvvvyp function
-function vvvvvyp(add_custom_button_vvvvvyp)
+function vvvvvyp(add_js_document_vvvvvyp)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyp == 1)
+	if (add_js_document_vvvvvyp == 1)
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		// add required attribute to js_document field
+		if (jform_vvvvvypvyk_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvypvyk_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		// remove required attribute from js_document field
+		if (!jform_vvvvvypvyk_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvypvyk_required = true;
+		}
+	}
+}
+
+// the vvvvvyq function
+function vvvvvyq(add_custom_button_vvvvvyq)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyq == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvypvyk_required)
+		if (jform_vvvvvyqvyl_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvypvyk_required = false;
+			jform_vvvvvyqvyl_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvypvyl_required)
+		if (jform_vvvvvyqvym_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvypvyl_required = false;
+			jform_vvvvvyqvym_required = false;
 		}
 	}
 	else
@@ -312,75 +312,75 @@ function vvvvvyp(add_custom_button_vvvvvyp)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvypvyk_required)
+		if (!jform_vvvvvyqvyl_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvypvyk_required = true;
+			jform_vvvvvyqvyl_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvypvyl_required)
+		if (!jform_vvvvvyqvym_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvypvyl_required = true;
-		}
-	}
-}
-
-// the vvvvvyq function
-function vvvvvyq(add_css_vvvvvyq)
-{
-	// set the function logic
-	if (add_css_vvvvvyq == 1)
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
-		if (jform_vvvvvyqvym_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyqvym_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
-		if (!jform_vvvvvyqvym_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvyqvym_required = true;
 		}
 	}
 }
 
 // the vvvvvyr function
-function vvvvvyr(add_php_ajax_vvvvvyr)
+function vvvvvyr(add_css_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyr == 1)
+	if (add_css_vvvvvyr == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		// add required attribute to css field
+		if (jform_vvvvvyrvyn_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyrvyn_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		// remove required attribute from css field
+		if (!jform_vvvvvyrvyn_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyrvyn_required = true;
+		}
+	}
+}
+
+// the vvvvvys function
+function vvvvvys(add_php_ajax_vvvvvys)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvys == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
 		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvyrvyn_required)
+		if (jform_vvvvvysvyo_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyrvyn_required = false;
+			jform_vvvvvysvyo_required = false;
 		}
 	}
 	else
@@ -388,13 +388,13 @@ function vvvvvyr(add_php_ajax_vvvvvyr)
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
 		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvyrvyn_required)
+		if (!jform_vvvvvysvyo_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyrvyn_required = true;
+			jform_vvvvvysvyo_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index fb8eb05a6..cafa094a3 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -9,44 +9,44 @@
  */
 
 // Some Global Values
-jform_vvvvwagvzv_required = false;
 jform_vvvvwahvzw_required = false;
-jform_vvvvwahvzx_required = false;
-jform_vvvvwahvzy_required = false;
+jform_vvvvwaivzx_required = false;
+jform_vvvvwaivzy_required = false;
+jform_vvvvwaivzz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwag(target_vvvvwag);
-
 	var target_vvvvwah = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwah(target_vvvvwah);
 
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
+	vvvvwai(target_vvvvwai);
 
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
 });
 
-// the vvvvwag function
-function vvvvwag(target_vvvvwag)
+// the vvvvwah function
+function vvvvwah(target_vvvvwah)
 {
 	// set the function logic
-	if (target_vvvvwag == 2)
+	if (target_vvvvwah == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
 		// add required attribute to function_name field
-		if (jform_vvvvwagvzv_required)
+		if (jform_vvvvwahvzw_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvwagvzv_required = false;
+			jform_vvvvwahvzw_required = false;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
@@ -55,102 +55,102 @@ function vvvvwag(target_vvvvwag)
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
 		// remove required attribute from function_name field
-		if (!jform_vvvvwagvzv_required)
+		if (!jform_vvvvwahvzw_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvwagvzv_required = true;
+			jform_vvvvwahvzw_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvwah function
-function vvvvwah(target_vvvvwah)
+// the vvvvwai function
+function vvvvwai(target_vvvvwai)
 {
 	// set the function logic
-	if (target_vvvvwah == 1)
+	if (target_vvvvwai == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
 		// add required attribute to component field
-		if (jform_vvvvwahvzw_required)
+		if (jform_vvvvwaivzx_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwahvzw_required = false;
+			jform_vvvvwaivzx_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwahvzx_required)
+		if (jform_vvvvwaivzy_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwahvzx_required = false;
+			jform_vvvvwaivzy_required = false;
 		}
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
 		// add required attribute to type field
-		if (jform_vvvvwahvzy_required)
+		if (jform_vvvvwaivzz_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwahvzy_required = false;
+			jform_vvvvwaivzz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
 		// remove required attribute from component field
-		if (!jform_vvvvwahvzw_required)
+		if (!jform_vvvvwaivzx_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwahvzw_required = true;
+			jform_vvvvwaivzx_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwahvzx_required)
+		if (!jform_vvvvwaivzy_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwahvzx_required = true;
+			jform_vvvvwaivzy_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
 		// remove required attribute from type field
-		if (!jform_vvvvwahvzy_required)
+		if (!jform_vvvvwaivzz_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwahvzy_required = true;
+			jform_vvvvwaivzz_required = true;
 		}
 	}
 }
 
-// the vvvvwai function
-function vvvvwai(target_vvvvwai,type_vvvvwai)
+// the vvvvwaj function
+function vvvvwaj(target_vvvvwaj,type_vvvvwaj)
 {
 	// set the function logic
-	if (target_vvvvwai == 1 && type_vvvvwai == 1)
+	if (target_vvvvwaj == 1 && type_vvvvwaj == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -162,11 +162,11 @@ function vvvvwai(target_vvvvwai,type_vvvvwai)
 	}
 }
 
-// the vvvvwaj function
-function vvvvwaj(type_vvvvwaj,target_vvvvwaj)
+// the vvvvwak function
+function vvvvwak(type_vvvvwak,target_vvvvwak)
 {
 	// set the function logic
-	if (type_vvvvwaj == 1 && target_vvvvwaj == 1)
+	if (type_vvvvwak == 1 && target_vvvvwak == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index 1e2806e5c..a4e776f6d 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -9,35 +9,32 @@
  */
 
 // Some Global Values
-jform_vvvvvzfvzb_required = false;
-jform_vvvvvzhvzc_required = false;
+jform_vvvvvzgvzc_required = false;
 jform_vvvvvzivzd_required = false;
 jform_vvvvvzjvze_required = false;
 jform_vvvvvzkvzf_required = false;
 jform_vvvvvzlvzg_required = false;
-jform_vvvvvzqvzh_required = false;
-jform_vvvvvzsvzi_required = false;
+jform_vvvvvzmvzh_required = false;
+jform_vvvvvzrvzi_required = false;
 jform_vvvvvztvzj_required = false;
-jform_vvvvvzvvzk_required = false;
-jform_vvvvvzvvzl_required = false;
+jform_vvvvvzuvzk_required = false;
+jform_vvvvvzwvzl_required = false;
 jform_vvvvvzwvzm_required = false;
 jform_vvvvvzxvzn_required = false;
 jform_vvvvvzyvzo_required = false;
-jform_vvvvwaavzp_required = false;
-jform_vvvvwaavzq_required = false;
-jform_vvvvwaavzr_required = false;
+jform_vvvvvzzvzp_required = false;
+jform_vvvvwabvzq_required = false;
+jform_vvvvwabvzr_required = false;
 jform_vvvvwabvzs_required = false;
 jform_vvvvwacvzt_required = false;
 jform_vvvvwadvzu_required = false;
+jform_vvvvwaevzv_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
-	vvvvvzf(gettype_vvvvvzf);
-
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	vvvvvzg(gettype_vvvvvzg);
 
 	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
 	vvvvvzh(main_source_vvvvvzh);
@@ -51,48 +48,48 @@ jQuery(document).ready(function()
 	var main_source_vvvvvzk = jQuery("#jform_main_source").val();
 	vvvvvzk(main_source_vvvvvzk);
 
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzl(addcalculation_vvvvvzl);
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
+	vvvvvzl(main_source_vvvvvzl);
 
 	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(addcalculation_vvvvvzm);
 
 	var addcalculation_vvvvvzn = jQuery("#jform_addcalculation input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
 	vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn);
 
-	var main_source_vvvvvzq = jQuery("#jform_main_source").val();
-	vvvvvzq(main_source_vvvvvzq);
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
 
 	var main_source_vvvvvzr = jQuery("#jform_main_source").val();
 	vvvvvzr(main_source_vvvvvzr);
 
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
+	var main_source_vvvvvzs = jQuery("#jform_main_source").val();
+	vvvvvzs(main_source_vvvvvzs);
 
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(gettype_vvvvvzv);
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
 
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(gettype_vvvvvzw);
 
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
-	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
-	vvvvwaa(gettype_vvvvwaa);
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
 
 	var gettype_vvvvwab = jQuery("#jform_gettype").val();
 	vvvvwab(gettype_vvvvwab);
@@ -101,27 +98,30 @@ jQuery(document).ready(function()
 	vvvvwac(gettype_vvvvwac);
 
 	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	vvvvwad(gettype_vvvvwad);
 
-	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
-	vvvvwaf(gettype_vvvvwaf);
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
+
+	var gettype_vvvvwag = jQuery("#jform_gettype").val();
+	vvvvwag(gettype_vvvvwag);
 });
 
-// the vvvvvzf function
-function vvvvvzf(gettype_vvvvvzf)
+// the vvvvvzg function
+function vvvvvzg(gettype_vvvvvzg)
 {
-	if (isSet(gettype_vvvvvzf) && gettype_vvvvvzf.constructor !== Array)
+	if (isSet(gettype_vvvvvzg) && gettype_vvvvvzg.constructor !== Array)
 	{
-		var temp_vvvvvzf = gettype_vvvvvzf;
-		var gettype_vvvvvzf = [];
-		gettype_vvvvvzf.push(temp_vvvvvzf);
+		var temp_vvvvvzg = gettype_vvvvvzg;
+		var gettype_vvvvvzg = [];
+		gettype_vvvvvzg.push(temp_vvvvvzg);
 	}
-	else if (!isSet(gettype_vvvvvzf))
+	else if (!isSet(gettype_vvvvvzg))
 	{
-		var gettype_vvvvvzf = [];
+		var gettype_vvvvvzg = [];
 	}
-	var gettype = gettype_vvvvvzf.some(gettype_vvvvvzf_SomeFunc);
+	var gettype = gettype_vvvvvzg.some(gettype_vvvvvzg_SomeFunc);
 
 
 	// set this function logic
@@ -129,73 +129,35 @@ function vvvvvzf(gettype_vvvvvzf)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
 		// add required attribute to getcustom field
-		if (jform_vvvvvzfvzb_required)
+		if (jform_vvvvvzgvzc_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvzfvzb_required = false;
+			jform_vvvvvzgvzc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
 		// remove required attribute from getcustom field
-		if (!jform_vvvvvzfvzb_required)
+		if (!jform_vvvvvzgvzc_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvzfvzb_required = true;
+			jform_vvvvvzgvzc_required = true;
 		}
 	}
 }
 
-// the vvvvvzf Some function
-function gettype_vvvvvzf_SomeFunc(gettype_vvvvvzf)
-{
-	// set the function logic
-	if (gettype_vvvvvzf == 3 || gettype_vvvvvzf == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzg function
-function vvvvvzg(main_source_vvvvvzg)
-{
-	if (isSet(main_source_vvvvvzg) && main_source_vvvvvzg.constructor !== Array)
-	{
-		var temp_vvvvvzg = main_source_vvvvvzg;
-		var main_source_vvvvvzg = [];
-		main_source_vvvvvzg.push(temp_vvvvvzg);
-	}
-	else if (!isSet(main_source_vvvvvzg))
-	{
-		var main_source_vvvvvzg = [];
-	}
-	var main_source = main_source_vvvvvzg.some(main_source_vvvvvzg_SomeFunc);
-
-
-	// set this function logic
-	if (main_source)
-	{
-		jQuery('#jform_select_all').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_select_all').closest('.control-group').hide();
-	}
-}
-
 // the vvvvvzg Some function
-function main_source_vvvvvzg_SomeFunc(main_source_vvvvvzg)
+function gettype_vvvvvzg_SomeFunc(gettype_vvvvvzg)
 {
 	// set the function logic
-	if (main_source_vvvvvzg == 1 || main_source_vvvvvzg == 2)
+	if (gettype_vvvvvzg == 3 || gettype_vvvvvzg == 4)
 	{
 		return true;
 	}
@@ -221,29 +183,11 @@ function vvvvvzh(main_source_vvvvvzh)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_view_table_main').closest('.control-group').show();
-		// add required attribute to view_table_main field
-		if (jform_vvvvvzhvzc_required)
-		{
-			updateFieldRequired('view_table_main',0);
-			jQuery('#jform_view_table_main').prop('required','required');
-			jQuery('#jform_view_table_main').attr('aria-required',true);
-			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvvzhvzc_required = false;
-		}
+		jQuery('#jform_select_all').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_view_table_main').closest('.control-group').hide();
-		// remove required attribute from view_table_main field
-		if (!jform_vvvvvzhvzc_required)
-		{
-			updateFieldRequired('view_table_main',1);
-			jQuery('#jform_view_table_main').removeAttr('required');
-			jQuery('#jform_view_table_main').removeAttr('aria-required');
-			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvvzhvzc_required = true;
-		}
+		jQuery('#jform_select_all').closest('.control-group').hide();
 	}
 }
 
@@ -251,7 +195,7 @@ function vvvvvzh(main_source_vvvvvzh)
 function main_source_vvvvvzh_SomeFunc(main_source_vvvvvzh)
 {
 	// set the function logic
-	if (main_source_vvvvvzh == 1)
+	if (main_source_vvvvvzh == 1 || main_source_vvvvvzh == 2)
 	{
 		return true;
 	}
@@ -277,27 +221,27 @@ function vvvvvzi(main_source_vvvvvzi)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_view_selection').closest('.control-group').show();
-		// add required attribute to view_selection field
+		jQuery('#jform_view_table_main').closest('.control-group').show();
+		// add required attribute to view_table_main field
 		if (jform_vvvvvzivzd_required)
 		{
-			updateFieldRequired('view_selection',0);
-			jQuery('#jform_view_selection').prop('required','required');
-			jQuery('#jform_view_selection').attr('aria-required',true);
-			jQuery('#jform_view_selection').addClass('required');
+			updateFieldRequired('view_table_main',0);
+			jQuery('#jform_view_table_main').prop('required','required');
+			jQuery('#jform_view_table_main').attr('aria-required',true);
+			jQuery('#jform_view_table_main').addClass('required');
 			jform_vvvvvzivzd_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_view_selection').closest('.control-group').hide();
-		// remove required attribute from view_selection field
+		jQuery('#jform_view_table_main').closest('.control-group').hide();
+		// remove required attribute from view_table_main field
 		if (!jform_vvvvvzivzd_required)
 		{
-			updateFieldRequired('view_selection',1);
-			jQuery('#jform_view_selection').removeAttr('required');
-			jQuery('#jform_view_selection').removeAttr('aria-required');
-			jQuery('#jform_view_selection').removeClass('required');
+			updateFieldRequired('view_table_main',1);
+			jQuery('#jform_view_table_main').removeAttr('required');
+			jQuery('#jform_view_table_main').removeAttr('aria-required');
+			jQuery('#jform_view_table_main').removeClass('required');
 			jform_vvvvvzivzd_required = true;
 		}
 	}
@@ -333,27 +277,27 @@ function vvvvvzj(main_source_vvvvvzj)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_db_table_main').closest('.control-group').show();
-		// add required attribute to db_table_main field
+		jQuery('#jform_view_selection').closest('.control-group').show();
+		// add required attribute to view_selection field
 		if (jform_vvvvvzjvze_required)
 		{
-			updateFieldRequired('db_table_main',0);
-			jQuery('#jform_db_table_main').prop('required','required');
-			jQuery('#jform_db_table_main').attr('aria-required',true);
-			jQuery('#jform_db_table_main').addClass('required');
+			updateFieldRequired('view_selection',0);
+			jQuery('#jform_view_selection').prop('required','required');
+			jQuery('#jform_view_selection').attr('aria-required',true);
+			jQuery('#jform_view_selection').addClass('required');
 			jform_vvvvvzjvze_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_db_table_main').closest('.control-group').hide();
-		// remove required attribute from db_table_main field
+		jQuery('#jform_view_selection').closest('.control-group').hide();
+		// remove required attribute from view_selection field
 		if (!jform_vvvvvzjvze_required)
 		{
-			updateFieldRequired('db_table_main',1);
-			jQuery('#jform_db_table_main').removeAttr('required');
-			jQuery('#jform_db_table_main').removeAttr('aria-required');
-			jQuery('#jform_db_table_main').removeClass('required');
+			updateFieldRequired('view_selection',1);
+			jQuery('#jform_view_selection').removeAttr('required');
+			jQuery('#jform_view_selection').removeAttr('aria-required');
+			jQuery('#jform_view_selection').removeClass('required');
 			jform_vvvvvzjvze_required = true;
 		}
 	}
@@ -363,7 +307,7 @@ function vvvvvzj(main_source_vvvvvzj)
 function main_source_vvvvvzj_SomeFunc(main_source_vvvvvzj)
 {
 	// set the function logic
-	if (main_source_vvvvvzj == 2)
+	if (main_source_vvvvvzj == 1)
 	{
 		return true;
 	}
@@ -389,27 +333,27 @@ function vvvvvzk(main_source_vvvvvzk)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_db_selection').closest('.control-group').show();
-		// add required attribute to db_selection field
+		jQuery('#jform_db_table_main').closest('.control-group').show();
+		// add required attribute to db_table_main field
 		if (jform_vvvvvzkvzf_required)
 		{
-			updateFieldRequired('db_selection',0);
-			jQuery('#jform_db_selection').prop('required','required');
-			jQuery('#jform_db_selection').attr('aria-required',true);
-			jQuery('#jform_db_selection').addClass('required');
+			updateFieldRequired('db_table_main',0);
+			jQuery('#jform_db_table_main').prop('required','required');
+			jQuery('#jform_db_table_main').attr('aria-required',true);
+			jQuery('#jform_db_table_main').addClass('required');
 			jform_vvvvvzkvzf_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_db_selection').closest('.control-group').hide();
-		// remove required attribute from db_selection field
+		jQuery('#jform_db_table_main').closest('.control-group').hide();
+		// remove required attribute from db_table_main field
 		if (!jform_vvvvvzkvzf_required)
 		{
-			updateFieldRequired('db_selection',1);
-			jQuery('#jform_db_selection').removeAttr('required');
-			jQuery('#jform_db_selection').removeAttr('aria-required');
-			jQuery('#jform_db_selection').removeClass('required');
+			updateFieldRequired('db_table_main',1);
+			jQuery('#jform_db_table_main').removeAttr('required');
+			jQuery('#jform_db_table_main').removeAttr('aria-required');
+			jQuery('#jform_db_table_main').removeClass('required');
 			jform_vvvvvzkvzf_required = true;
 		}
 	}
@@ -427,98 +371,93 @@ function main_source_vvvvvzk_SomeFunc(main_source_vvvvvzk)
 }
 
 // the vvvvvzl function
-function vvvvvzl(addcalculation_vvvvvzl)
+function vvvvvzl(main_source_vvvvvzl)
+{
+	if (isSet(main_source_vvvvvzl) && main_source_vvvvvzl.constructor !== Array)
+	{
+		var temp_vvvvvzl = main_source_vvvvvzl;
+		var main_source_vvvvvzl = [];
+		main_source_vvvvvzl.push(temp_vvvvvzl);
+	}
+	else if (!isSet(main_source_vvvvvzl))
+	{
+		var main_source_vvvvvzl = [];
+	}
+	var main_source = main_source_vvvvvzl.some(main_source_vvvvvzl_SomeFunc);
+
+
+	// set this function logic
+	if (main_source)
+	{
+		jQuery('#jform_db_selection').closest('.control-group').show();
+		// add required attribute to db_selection field
+		if (jform_vvvvvzlvzg_required)
+		{
+			updateFieldRequired('db_selection',0);
+			jQuery('#jform_db_selection').prop('required','required');
+			jQuery('#jform_db_selection').attr('aria-required',true);
+			jQuery('#jform_db_selection').addClass('required');
+			jform_vvvvvzlvzg_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_db_selection').closest('.control-group').hide();
+		// remove required attribute from db_selection field
+		if (!jform_vvvvvzlvzg_required)
+		{
+			updateFieldRequired('db_selection',1);
+			jQuery('#jform_db_selection').removeAttr('required');
+			jQuery('#jform_db_selection').removeAttr('aria-required');
+			jQuery('#jform_db_selection').removeClass('required');
+			jform_vvvvvzlvzg_required = true;
+		}
+	}
+}
+
+// the vvvvvzl Some function
+function main_source_vvvvvzl_SomeFunc(main_source_vvvvvzl)
 {
 	// set the function logic
-	if (addcalculation_vvvvvzl == 1)
+	if (main_source_vvvvvzl == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzm function
+function vvvvvzm(addcalculation_vvvvvzm)
+{
+	// set the function logic
+	if (addcalculation_vvvvvzm == 1)
 	{
 		jQuery('#jform_php_calculation-lbl').closest('.control-group').show();
 		// add required attribute to php_calculation field
-		if (jform_vvvvvzlvzg_required)
+		if (jform_vvvvvzmvzh_required)
 		{
 			updateFieldRequired('php_calculation',0);
 			jQuery('#jform_php_calculation').prop('required','required');
 			jQuery('#jform_php_calculation').attr('aria-required',true);
 			jQuery('#jform_php_calculation').addClass('required');
-			jform_vvvvvzlvzg_required = false;
+			jform_vvvvvzmvzh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_calculation-lbl').closest('.control-group').hide();
 		// remove required attribute from php_calculation field
-		if (!jform_vvvvvzlvzg_required)
+		if (!jform_vvvvvzmvzh_required)
 		{
 			updateFieldRequired('php_calculation',1);
 			jQuery('#jform_php_calculation').removeAttr('required');
 			jQuery('#jform_php_calculation').removeAttr('aria-required');
 			jQuery('#jform_php_calculation').removeClass('required');
-			jform_vvvvvzlvzg_required = true;
+			jform_vvvvvzmvzh_required = true;
 		}
 	}
 }
 
-// the vvvvvzm function
-function vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm)
-{
-	if (isSet(addcalculation_vvvvvzm) && addcalculation_vvvvvzm.constructor !== Array)
-	{
-		var temp_vvvvvzm = addcalculation_vvvvvzm;
-		var addcalculation_vvvvvzm = [];
-		addcalculation_vvvvvzm.push(temp_vvvvvzm);
-	}
-	else if (!isSet(addcalculation_vvvvvzm))
-	{
-		var addcalculation_vvvvvzm = [];
-	}
-	var addcalculation = addcalculation_vvvvvzm.some(addcalculation_vvvvvzm_SomeFunc);
-
-	if (isSet(gettype_vvvvvzm) && gettype_vvvvvzm.constructor !== Array)
-	{
-		var temp_vvvvvzm = gettype_vvvvvzm;
-		var gettype_vvvvvzm = [];
-		gettype_vvvvvzm.push(temp_vvvvvzm);
-	}
-	else if (!isSet(gettype_vvvvvzm))
-	{
-		var gettype_vvvvvzm = [];
-	}
-	var gettype = gettype_vvvvvzm.some(gettype_vvvvvzm_SomeFunc);
-
-
-	// set this function logic
-	if (addcalculation && gettype)
-	{
-		jQuery('.note_calculation_item').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_calculation_item').closest('.control-group').hide();
-	}
-}
-
-// the vvvvvzm Some function
-function addcalculation_vvvvvzm_SomeFunc(addcalculation_vvvvvzm)
-{
-	// set the function logic
-	if (addcalculation_vvvvvzm == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzm Some function
-function gettype_vvvvvzm_SomeFunc(gettype_vvvvvzm)
-{
-	// set the function logic
-	if (gettype_vvvvvzm == 1 || gettype_vvvvvzm == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzn function
 function vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn)
 {
@@ -550,11 +489,11 @@ function vvvvvzn(addcalculation_vvvvvzn,gettype_vvvvvzn)
 	// set this function logic
 	if (addcalculation && gettype)
 	{
-		jQuery('.note_calculation_items').closest('.control-group').show();
+		jQuery('.note_calculation_item').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_calculation_items').closest('.control-group').hide();
+		jQuery('.note_calculation_item').closest('.control-group').hide();
 	}
 }
 
@@ -573,63 +512,68 @@ function addcalculation_vvvvvzn_SomeFunc(addcalculation_vvvvvzn)
 function gettype_vvvvvzn_SomeFunc(gettype_vvvvvzn)
 {
 	// set the function logic
-	if (gettype_vvvvvzn == 2 || gettype_vvvvvzn == 4)
+	if (gettype_vvvvvzn == 1 || gettype_vvvvvzn == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvvzq function
-function vvvvvzq(main_source_vvvvvzq)
+// the vvvvvzo function
+function vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo)
 {
-	if (isSet(main_source_vvvvvzq) && main_source_vvvvvzq.constructor !== Array)
+	if (isSet(addcalculation_vvvvvzo) && addcalculation_vvvvvzo.constructor !== Array)
 	{
-		var temp_vvvvvzq = main_source_vvvvvzq;
-		var main_source_vvvvvzq = [];
-		main_source_vvvvvzq.push(temp_vvvvvzq);
+		var temp_vvvvvzo = addcalculation_vvvvvzo;
+		var addcalculation_vvvvvzo = [];
+		addcalculation_vvvvvzo.push(temp_vvvvvzo);
 	}
-	else if (!isSet(main_source_vvvvvzq))
+	else if (!isSet(addcalculation_vvvvvzo))
 	{
-		var main_source_vvvvvzq = [];
+		var addcalculation_vvvvvzo = [];
 	}
-	var main_source = main_source_vvvvvzq.some(main_source_vvvvvzq_SomeFunc);
+	var addcalculation = addcalculation_vvvvvzo.some(addcalculation_vvvvvzo_SomeFunc);
+
+	if (isSet(gettype_vvvvvzo) && gettype_vvvvvzo.constructor !== Array)
+	{
+		var temp_vvvvvzo = gettype_vvvvvzo;
+		var gettype_vvvvvzo = [];
+		gettype_vvvvvzo.push(temp_vvvvvzo);
+	}
+	else if (!isSet(gettype_vvvvvzo))
+	{
+		var gettype_vvvvvzo = [];
+	}
+	var gettype = gettype_vvvvvzo.some(gettype_vvvvvzo_SomeFunc);
 
 
 	// set this function logic
-	if (main_source)
+	if (addcalculation && gettype)
 	{
-		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
-		// add required attribute to php_custom_get field
-		if (jform_vvvvvzqvzh_required)
-		{
-			updateFieldRequired('php_custom_get',0);
-			jQuery('#jform_php_custom_get').prop('required','required');
-			jQuery('#jform_php_custom_get').attr('aria-required',true);
-			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzqvzh_required = false;
-		}
+		jQuery('.note_calculation_items').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
-		// remove required attribute from php_custom_get field
-		if (!jform_vvvvvzqvzh_required)
-		{
-			updateFieldRequired('php_custom_get',1);
-			jQuery('#jform_php_custom_get').removeAttr('required');
-			jQuery('#jform_php_custom_get').removeAttr('aria-required');
-			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzqvzh_required = true;
-		}
+		jQuery('.note_calculation_items').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzq Some function
-function main_source_vvvvvzq_SomeFunc(main_source_vvvvvzq)
+// the vvvvvzo Some function
+function addcalculation_vvvvvzo_SomeFunc(addcalculation_vvvvvzo)
 {
 	// set the function logic
-	if (main_source_vvvvvzq == 3)
+	if (addcalculation_vvvvvzo == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzo Some function
+function gettype_vvvvvzo_SomeFunc(gettype_vvvvvzo)
+{
+	// set the function logic
+	if (gettype_vvvvvzo == 2 || gettype_vvvvvzo == 4)
 	{
 		return true;
 	}
@@ -652,6 +596,62 @@ function vvvvvzr(main_source_vvvvvzr)
 	var main_source = main_source_vvvvvzr.some(main_source_vvvvvzr_SomeFunc);
 
 
+	// set this function logic
+	if (main_source)
+	{
+		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
+		// add required attribute to php_custom_get field
+		if (jform_vvvvvzrvzi_required)
+		{
+			updateFieldRequired('php_custom_get',0);
+			jQuery('#jform_php_custom_get').prop('required','required');
+			jQuery('#jform_php_custom_get').attr('aria-required',true);
+			jQuery('#jform_php_custom_get').addClass('required');
+			jform_vvvvvzrvzi_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
+		// remove required attribute from php_custom_get field
+		if (!jform_vvvvvzrvzi_required)
+		{
+			updateFieldRequired('php_custom_get',1);
+			jQuery('#jform_php_custom_get').removeAttr('required');
+			jQuery('#jform_php_custom_get').removeAttr('aria-required');
+			jQuery('#jform_php_custom_get').removeClass('required');
+			jform_vvvvvzrvzi_required = true;
+		}
+	}
+}
+
+// the vvvvvzr Some function
+function main_source_vvvvvzr_SomeFunc(main_source_vvvvvzr)
+{
+	// set the function logic
+	if (main_source_vvvvvzr == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzs function
+function vvvvvzs(main_source_vvvvvzs)
+{
+	if (isSet(main_source_vvvvvzs) && main_source_vvvvvzs.constructor !== Array)
+	{
+		var temp_vvvvvzs = main_source_vvvvvzs;
+		var main_source_vvvvvzs = [];
+		main_source_vvvvvzs.push(temp_vvvvvzs);
+	}
+	else if (!isSet(main_source_vvvvvzs))
+	{
+		var main_source_vvvvvzs = [];
+	}
+	var main_source = main_source_vvvvvzs.some(main_source_vvvvvzs_SomeFunc);
+
+
 	// set this function logic
 	if (main_source)
 	{
@@ -675,90 +675,11 @@ function vvvvvzr(main_source_vvvvvzr)
 	}
 }
 
-// the vvvvvzr Some function
-function main_source_vvvvvzr_SomeFunc(main_source_vvvvvzr)
-{
-	// set the function logic
-	if (main_source_vvvvvzr == 1 || main_source_vvvvvzr == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzs function
-function vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs)
-{
-	if (isSet(add_php_before_getitem_vvvvvzs) && add_php_before_getitem_vvvvvzs.constructor !== Array)
-	{
-		var temp_vvvvvzs = add_php_before_getitem_vvvvvzs;
-		var add_php_before_getitem_vvvvvzs = [];
-		add_php_before_getitem_vvvvvzs.push(temp_vvvvvzs);
-	}
-	else if (!isSet(add_php_before_getitem_vvvvvzs))
-	{
-		var add_php_before_getitem_vvvvvzs = [];
-	}
-	var add_php_before_getitem = add_php_before_getitem_vvvvvzs.some(add_php_before_getitem_vvvvvzs_SomeFunc);
-
-	if (isSet(gettype_vvvvvzs) && gettype_vvvvvzs.constructor !== Array)
-	{
-		var temp_vvvvvzs = gettype_vvvvvzs;
-		var gettype_vvvvvzs = [];
-		gettype_vvvvvzs.push(temp_vvvvvzs);
-	}
-	else if (!isSet(gettype_vvvvvzs))
-	{
-		var gettype_vvvvvzs = [];
-	}
-	var gettype = gettype_vvvvvzs.some(gettype_vvvvvzs_SomeFunc);
-
-
-	// set this function logic
-	if (add_php_before_getitem && gettype)
-	{
-		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
-		// add required attribute to php_before_getitem field
-		if (jform_vvvvvzsvzi_required)
-		{
-			updateFieldRequired('php_before_getitem',0);
-			jQuery('#jform_php_before_getitem').prop('required','required');
-			jQuery('#jform_php_before_getitem').attr('aria-required',true);
-			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzsvzi_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_getitem field
-		if (!jform_vvvvvzsvzi_required)
-		{
-			updateFieldRequired('php_before_getitem',1);
-			jQuery('#jform_php_before_getitem').removeAttr('required');
-			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzsvzi_required = true;
-		}
-	}
-}
-
 // the vvvvvzs Some function
-function add_php_before_getitem_vvvvvzs_SomeFunc(add_php_before_getitem_vvvvvzs)
+function main_source_vvvvvzs_SomeFunc(main_source_vvvvvzs)
 {
 	// set the function logic
-	if (add_php_before_getitem_vvvvvzs == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzs Some function
-function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs)
-{
-	// set the function logic
-	if (gettype_vvvvvzs == 1 || gettype_vvvvvzs == 3)
+	if (main_source_vvvvvzs == 1 || main_source_vvvvvzs == 2)
 	{
 		return true;
 	}
@@ -766,19 +687,19 @@ function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs)
 }
 
 // the vvvvvzt function
-function vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt)
+function vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt)
 {
-	if (isSet(add_php_after_getitem_vvvvvzt) && add_php_after_getitem_vvvvvzt.constructor !== Array)
+	if (isSet(add_php_before_getitem_vvvvvzt) && add_php_before_getitem_vvvvvzt.constructor !== Array)
 	{
-		var temp_vvvvvzt = add_php_after_getitem_vvvvvzt;
-		var add_php_after_getitem_vvvvvzt = [];
-		add_php_after_getitem_vvvvvzt.push(temp_vvvvvzt);
+		var temp_vvvvvzt = add_php_before_getitem_vvvvvzt;
+		var add_php_before_getitem_vvvvvzt = [];
+		add_php_before_getitem_vvvvvzt.push(temp_vvvvvzt);
 	}
-	else if (!isSet(add_php_after_getitem_vvvvvzt))
+	else if (!isSet(add_php_before_getitem_vvvvvzt))
 	{
-		var add_php_after_getitem_vvvvvzt = [];
+		var add_php_before_getitem_vvvvvzt = [];
 	}
-	var add_php_after_getitem = add_php_after_getitem_vvvvvzt.some(add_php_after_getitem_vvvvvzt_SomeFunc);
+	var add_php_before_getitem = add_php_before_getitem_vvvvvzt.some(add_php_before_getitem_vvvvvzt_SomeFunc);
 
 	if (isSet(gettype_vvvvvzt) && gettype_vvvvvzt.constructor !== Array)
 	{
@@ -794,39 +715,39 @@ function vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt)
 
 
 	// set this function logic
-	if (add_php_after_getitem && gettype)
+	if (add_php_before_getitem && gettype)
 	{
-		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
-		// add required attribute to php_after_getitem field
+		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
+		// add required attribute to php_before_getitem field
 		if (jform_vvvvvztvzj_required)
 		{
-			updateFieldRequired('php_after_getitem',0);
-			jQuery('#jform_php_after_getitem').prop('required','required');
-			jQuery('#jform_php_after_getitem').attr('aria-required',true);
-			jQuery('#jform_php_after_getitem').addClass('required');
+			updateFieldRequired('php_before_getitem',0);
+			jQuery('#jform_php_before_getitem').prop('required','required');
+			jQuery('#jform_php_before_getitem').attr('aria-required',true);
+			jQuery('#jform_php_before_getitem').addClass('required');
 			jform_vvvvvztvzj_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_getitem field
+		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_getitem field
 		if (!jform_vvvvvztvzj_required)
 		{
-			updateFieldRequired('php_after_getitem',1);
-			jQuery('#jform_php_after_getitem').removeAttr('required');
-			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitem').removeClass('required');
+			updateFieldRequired('php_before_getitem',1);
+			jQuery('#jform_php_before_getitem').removeAttr('required');
+			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
+			jQuery('#jform_php_before_getitem').removeClass('required');
 			jform_vvvvvztvzj_required = true;
 		}
 	}
 }
 
 // the vvvvvzt Some function
-function add_php_after_getitem_vvvvvzt_SomeFunc(add_php_after_getitem_vvvvvzt)
+function add_php_before_getitem_vvvvvzt_SomeFunc(add_php_before_getitem_vvvvvzt)
 {
 	// set the function logic
-	if (add_php_after_getitem_vvvvvzt == 1)
+	if (add_php_before_getitem_vvvvvzt == 1)
 	{
 		return true;
 	}
@@ -844,76 +765,79 @@ function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt)
 	return false;
 }
 
-// the vvvvvzv function
-function vvvvvzv(gettype_vvvvvzv)
+// the vvvvvzu function
+function vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu)
 {
-	if (isSet(gettype_vvvvvzv) && gettype_vvvvvzv.constructor !== Array)
+	if (isSet(add_php_after_getitem_vvvvvzu) && add_php_after_getitem_vvvvvzu.constructor !== Array)
 	{
-		var temp_vvvvvzv = gettype_vvvvvzv;
-		var gettype_vvvvvzv = [];
-		gettype_vvvvvzv.push(temp_vvvvvzv);
+		var temp_vvvvvzu = add_php_after_getitem_vvvvvzu;
+		var add_php_after_getitem_vvvvvzu = [];
+		add_php_after_getitem_vvvvvzu.push(temp_vvvvvzu);
 	}
-	else if (!isSet(gettype_vvvvvzv))
+	else if (!isSet(add_php_after_getitem_vvvvvzu))
 	{
-		var gettype_vvvvvzv = [];
+		var add_php_after_getitem_vvvvvzu = [];
 	}
-	var gettype = gettype_vvvvvzv.some(gettype_vvvvvzv_SomeFunc);
+	var add_php_after_getitem = add_php_after_getitem_vvvvvzu.some(add_php_after_getitem_vvvvvzu_SomeFunc);
+
+	if (isSet(gettype_vvvvvzu) && gettype_vvvvvzu.constructor !== Array)
+	{
+		var temp_vvvvvzu = gettype_vvvvvzu;
+		var gettype_vvvvvzu = [];
+		gettype_vvvvvzu.push(temp_vvvvvzu);
+	}
+	else if (!isSet(gettype_vvvvvzu))
+	{
+		var gettype_vvvvvzu = [];
+	}
+	var gettype = gettype_vvvvvzu.some(gettype_vvvvvzu_SomeFunc);
 
 
 	// set this function logic
-	if (gettype)
+	if (add_php_after_getitem && gettype)
 	{
-		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		// add required attribute to add_php_after_getitem field
-		if (jform_vvvvvzvvzk_required)
+		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
+		// add required attribute to php_after_getitem field
+		if (jform_vvvvvzuvzk_required)
 		{
-			updateFieldRequired('add_php_after_getitem',0);
-			jQuery('#jform_add_php_after_getitem').prop('required','required');
-			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
-			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvvzvvzk_required = false;
-		}
-		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		// add required attribute to add_php_before_getitem field
-		if (jform_vvvvvzvvzl_required)
-		{
-			updateFieldRequired('add_php_before_getitem',0);
-			jQuery('#jform_add_php_before_getitem').prop('required','required');
-			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
-			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvvzvvzl_required = false;
+			updateFieldRequired('php_after_getitem',0);
+			jQuery('#jform_php_after_getitem').prop('required','required');
+			jQuery('#jform_php_after_getitem').attr('aria-required',true);
+			jQuery('#jform_php_after_getitem').addClass('required');
+			jform_vvvvvzuvzk_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		// remove required attribute from add_php_after_getitem field
-		if (!jform_vvvvvzvvzk_required)
+		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_getitem field
+		if (!jform_vvvvvzuvzk_required)
 		{
-			updateFieldRequired('add_php_after_getitem',1);
-			jQuery('#jform_add_php_after_getitem').removeAttr('required');
-			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
-			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvvzvvzk_required = true;
-		}
-		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		// remove required attribute from add_php_before_getitem field
-		if (!jform_vvvvvzvvzl_required)
-		{
-			updateFieldRequired('add_php_before_getitem',1);
-			jQuery('#jform_add_php_before_getitem').removeAttr('required');
-			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
-			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvvzvvzl_required = true;
+			updateFieldRequired('php_after_getitem',1);
+			jQuery('#jform_php_after_getitem').removeAttr('required');
+			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
+			jQuery('#jform_php_after_getitem').removeClass('required');
+			jform_vvvvvzuvzk_required = true;
 		}
 	}
 }
 
-// the vvvvvzv Some function
-function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv)
+// the vvvvvzu Some function
+function add_php_after_getitem_vvvvvzu_SomeFunc(add_php_after_getitem_vvvvvzu)
 {
 	// set the function logic
-	if (gettype_vvvvvzv == 1 || gettype_vvvvvzv == 3)
+	if (add_php_after_getitem_vvvvvzu == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzu Some function
+function gettype_vvvvvzu_SomeFunc(gettype_vvvvvzu)
+{
+	// set the function logic
+	if (gettype_vvvvvzu == 1 || gettype_vvvvvzu == 3)
 	{
 		return true;
 	}
@@ -921,20 +845,8 @@ function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv)
 }
 
 // the vvvvvzw function
-function vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw)
+function vvvvvzw(gettype_vvvvvzw)
 {
-	if (isSet(add_php_getlistquery_vvvvvzw) && add_php_getlistquery_vvvvvzw.constructor !== Array)
-	{
-		var temp_vvvvvzw = add_php_getlistquery_vvvvvzw;
-		var add_php_getlistquery_vvvvvzw = [];
-		add_php_getlistquery_vvvvvzw.push(temp_vvvvvzw);
-	}
-	else if (!isSet(add_php_getlistquery_vvvvvzw))
-	{
-		var add_php_getlistquery_vvvvvzw = [];
-	}
-	var add_php_getlistquery = add_php_getlistquery_vvvvvzw.some(add_php_getlistquery_vvvvvzw_SomeFunc);
-
 	if (isSet(gettype_vvvvvzw) && gettype_vvvvvzw.constructor !== Array)
 	{
 		var temp_vvvvvzw = gettype_vvvvvzw;
@@ -949,50 +861,59 @@ function vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw)
 
 
 	// set this function logic
-	if (add_php_getlistquery && gettype)
+	if (gettype)
 	{
-		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
-		// add required attribute to php_getlistquery field
+		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
+		// add required attribute to add_php_after_getitem field
+		if (jform_vvvvvzwvzl_required)
+		{
+			updateFieldRequired('add_php_after_getitem',0);
+			jQuery('#jform_add_php_after_getitem').prop('required','required');
+			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
+			jQuery('#jform_add_php_after_getitem').addClass('required');
+			jform_vvvvvzwvzl_required = false;
+		}
+		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
+		// add required attribute to add_php_before_getitem field
 		if (jform_vvvvvzwvzm_required)
 		{
-			updateFieldRequired('php_getlistquery',0);
-			jQuery('#jform_php_getlistquery').prop('required','required');
-			jQuery('#jform_php_getlistquery').attr('aria-required',true);
-			jQuery('#jform_php_getlistquery').addClass('required');
+			updateFieldRequired('add_php_before_getitem',0);
+			jQuery('#jform_add_php_before_getitem').prop('required','required');
+			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
+			jQuery('#jform_add_php_before_getitem').addClass('required');
 			jform_vvvvvzwvzm_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
-		// remove required attribute from php_getlistquery field
+		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
+		// remove required attribute from add_php_after_getitem field
+		if (!jform_vvvvvzwvzl_required)
+		{
+			updateFieldRequired('add_php_after_getitem',1);
+			jQuery('#jform_add_php_after_getitem').removeAttr('required');
+			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
+			jQuery('#jform_add_php_after_getitem').removeClass('required');
+			jform_vvvvvzwvzl_required = true;
+		}
+		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
+		// remove required attribute from add_php_before_getitem field
 		if (!jform_vvvvvzwvzm_required)
 		{
-			updateFieldRequired('php_getlistquery',1);
-			jQuery('#jform_php_getlistquery').removeAttr('required');
-			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
-			jQuery('#jform_php_getlistquery').removeClass('required');
+			updateFieldRequired('add_php_before_getitem',1);
+			jQuery('#jform_add_php_before_getitem').removeAttr('required');
+			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
+			jQuery('#jform_add_php_before_getitem').removeClass('required');
 			jform_vvvvvzwvzm_required = true;
 		}
 	}
 }
 
-// the vvvvvzw Some function
-function add_php_getlistquery_vvvvvzw_SomeFunc(add_php_getlistquery_vvvvvzw)
-{
-	// set the function logic
-	if (add_php_getlistquery_vvvvvzw == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzw Some function
 function gettype_vvvvvzw_SomeFunc(gettype_vvvvvzw)
 {
 	// set the function logic
-	if (gettype_vvvvvzw == 2 || gettype_vvvvvzw == 4)
+	if (gettype_vvvvvzw == 1 || gettype_vvvvvzw == 3)
 	{
 		return true;
 	}
@@ -1000,19 +921,19 @@ function gettype_vvvvvzw_SomeFunc(gettype_vvvvvzw)
 }
 
 // the vvvvvzx function
-function vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx)
+function vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx)
 {
-	if (isSet(add_php_before_getitems_vvvvvzx) && add_php_before_getitems_vvvvvzx.constructor !== Array)
+	if (isSet(add_php_getlistquery_vvvvvzx) && add_php_getlistquery_vvvvvzx.constructor !== Array)
 	{
-		var temp_vvvvvzx = add_php_before_getitems_vvvvvzx;
-		var add_php_before_getitems_vvvvvzx = [];
-		add_php_before_getitems_vvvvvzx.push(temp_vvvvvzx);
+		var temp_vvvvvzx = add_php_getlistquery_vvvvvzx;
+		var add_php_getlistquery_vvvvvzx = [];
+		add_php_getlistquery_vvvvvzx.push(temp_vvvvvzx);
 	}
-	else if (!isSet(add_php_before_getitems_vvvvvzx))
+	else if (!isSet(add_php_getlistquery_vvvvvzx))
 	{
-		var add_php_before_getitems_vvvvvzx = [];
+		var add_php_getlistquery_vvvvvzx = [];
 	}
-	var add_php_before_getitems = add_php_before_getitems_vvvvvzx.some(add_php_before_getitems_vvvvvzx_SomeFunc);
+	var add_php_getlistquery = add_php_getlistquery_vvvvvzx.some(add_php_getlistquery_vvvvvzx_SomeFunc);
 
 	if (isSet(gettype_vvvvvzx) && gettype_vvvvvzx.constructor !== Array)
 	{
@@ -1028,39 +949,39 @@ function vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx)
 
 
 	// set this function logic
-	if (add_php_before_getitems && gettype)
+	if (add_php_getlistquery && gettype)
 	{
-		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
-		// add required attribute to php_before_getitems field
+		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
+		// add required attribute to php_getlistquery field
 		if (jform_vvvvvzxvzn_required)
 		{
-			updateFieldRequired('php_before_getitems',0);
-			jQuery('#jform_php_before_getitems').prop('required','required');
-			jQuery('#jform_php_before_getitems').attr('aria-required',true);
-			jQuery('#jform_php_before_getitems').addClass('required');
+			updateFieldRequired('php_getlistquery',0);
+			jQuery('#jform_php_getlistquery').prop('required','required');
+			jQuery('#jform_php_getlistquery').attr('aria-required',true);
+			jQuery('#jform_php_getlistquery').addClass('required');
 			jform_vvvvvzxvzn_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
-		// remove required attribute from php_before_getitems field
+		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
+		// remove required attribute from php_getlistquery field
 		if (!jform_vvvvvzxvzn_required)
 		{
-			updateFieldRequired('php_before_getitems',1);
-			jQuery('#jform_php_before_getitems').removeAttr('required');
-			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitems').removeClass('required');
+			updateFieldRequired('php_getlistquery',1);
+			jQuery('#jform_php_getlistquery').removeAttr('required');
+			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
+			jQuery('#jform_php_getlistquery').removeClass('required');
 			jform_vvvvvzxvzn_required = true;
 		}
 	}
 }
 
 // the vvvvvzx Some function
-function add_php_before_getitems_vvvvvzx_SomeFunc(add_php_before_getitems_vvvvvzx)
+function add_php_getlistquery_vvvvvzx_SomeFunc(add_php_getlistquery_vvvvvzx)
 {
 	// set the function logic
-	if (add_php_before_getitems_vvvvvzx == 1)
+	if (add_php_getlistquery_vvvvvzx == 1)
 	{
 		return true;
 	}
@@ -1079,19 +1000,19 @@ function gettype_vvvvvzx_SomeFunc(gettype_vvvvvzx)
 }
 
 // the vvvvvzy function
-function vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy)
+function vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy)
 {
-	if (isSet(add_php_after_getitems_vvvvvzy) && add_php_after_getitems_vvvvvzy.constructor !== Array)
+	if (isSet(add_php_before_getitems_vvvvvzy) && add_php_before_getitems_vvvvvzy.constructor !== Array)
 	{
-		var temp_vvvvvzy = add_php_after_getitems_vvvvvzy;
-		var add_php_after_getitems_vvvvvzy = [];
-		add_php_after_getitems_vvvvvzy.push(temp_vvvvvzy);
+		var temp_vvvvvzy = add_php_before_getitems_vvvvvzy;
+		var add_php_before_getitems_vvvvvzy = [];
+		add_php_before_getitems_vvvvvzy.push(temp_vvvvvzy);
 	}
-	else if (!isSet(add_php_after_getitems_vvvvvzy))
+	else if (!isSet(add_php_before_getitems_vvvvvzy))
 	{
-		var add_php_after_getitems_vvvvvzy = [];
+		var add_php_before_getitems_vvvvvzy = [];
 	}
-	var add_php_after_getitems = add_php_after_getitems_vvvvvzy.some(add_php_after_getitems_vvvvvzy_SomeFunc);
+	var add_php_before_getitems = add_php_before_getitems_vvvvvzy.some(add_php_before_getitems_vvvvvzy_SomeFunc);
 
 	if (isSet(gettype_vvvvvzy) && gettype_vvvvvzy.constructor !== Array)
 	{
@@ -1107,39 +1028,39 @@ function vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy)
 
 
 	// set this function logic
-	if (add_php_after_getitems && gettype)
+	if (add_php_before_getitems && gettype)
 	{
-		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
-		// add required attribute to php_after_getitems field
+		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
+		// add required attribute to php_before_getitems field
 		if (jform_vvvvvzyvzo_required)
 		{
-			updateFieldRequired('php_after_getitems',0);
-			jQuery('#jform_php_after_getitems').prop('required','required');
-			jQuery('#jform_php_after_getitems').attr('aria-required',true);
-			jQuery('#jform_php_after_getitems').addClass('required');
+			updateFieldRequired('php_before_getitems',0);
+			jQuery('#jform_php_before_getitems').prop('required','required');
+			jQuery('#jform_php_before_getitems').attr('aria-required',true);
+			jQuery('#jform_php_before_getitems').addClass('required');
 			jform_vvvvvzyvzo_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
-		// remove required attribute from php_after_getitems field
+		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
+		// remove required attribute from php_before_getitems field
 		if (!jform_vvvvvzyvzo_required)
 		{
-			updateFieldRequired('php_after_getitems',1);
-			jQuery('#jform_php_after_getitems').removeAttr('required');
-			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitems').removeClass('required');
+			updateFieldRequired('php_before_getitems',1);
+			jQuery('#jform_php_before_getitems').removeAttr('required');
+			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
+			jQuery('#jform_php_before_getitems').removeClass('required');
 			jform_vvvvvzyvzo_required = true;
 		}
 	}
 }
 
 // the vvvvvzy Some function
-function add_php_after_getitems_vvvvvzy_SomeFunc(add_php_after_getitems_vvvvvzy)
+function add_php_before_getitems_vvvvvzy_SomeFunc(add_php_before_getitems_vvvvvzy)
 {
 	// set the function logic
-	if (add_php_after_getitems_vvvvvzy == 1)
+	if (add_php_before_getitems_vvvvvzy == 1)
 	{
 		return true;
 	}
@@ -1157,96 +1078,79 @@ function gettype_vvvvvzy_SomeFunc(gettype_vvvvvzy)
 	return false;
 }
 
-// the vvvvwaa function
-function vvvvwaa(gettype_vvvvwaa)
+// the vvvvvzz function
+function vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz)
 {
-	if (isSet(gettype_vvvvwaa) && gettype_vvvvwaa.constructor !== Array)
+	if (isSet(add_php_after_getitems_vvvvvzz) && add_php_after_getitems_vvvvvzz.constructor !== Array)
 	{
-		var temp_vvvvwaa = gettype_vvvvwaa;
-		var gettype_vvvvwaa = [];
-		gettype_vvvvwaa.push(temp_vvvvwaa);
+		var temp_vvvvvzz = add_php_after_getitems_vvvvvzz;
+		var add_php_after_getitems_vvvvvzz = [];
+		add_php_after_getitems_vvvvvzz.push(temp_vvvvvzz);
 	}
-	else if (!isSet(gettype_vvvvwaa))
+	else if (!isSet(add_php_after_getitems_vvvvvzz))
 	{
-		var gettype_vvvvwaa = [];
+		var add_php_after_getitems_vvvvvzz = [];
 	}
-	var gettype = gettype_vvvvwaa.some(gettype_vvvvwaa_SomeFunc);
+	var add_php_after_getitems = add_php_after_getitems_vvvvvzz.some(add_php_after_getitems_vvvvvzz_SomeFunc);
+
+	if (isSet(gettype_vvvvvzz) && gettype_vvvvvzz.constructor !== Array)
+	{
+		var temp_vvvvvzz = gettype_vvvvvzz;
+		var gettype_vvvvvzz = [];
+		gettype_vvvvvzz.push(temp_vvvvvzz);
+	}
+	else if (!isSet(gettype_vvvvvzz))
+	{
+		var gettype_vvvvvzz = [];
+	}
+	var gettype = gettype_vvvvvzz.some(gettype_vvvvvzz_SomeFunc);
 
 
 	// set this function logic
-	if (gettype)
+	if (add_php_after_getitems && gettype)
 	{
-		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		// add required attribute to add_php_after_getitems field
-		if (jform_vvvvwaavzp_required)
+		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
+		// add required attribute to php_after_getitems field
+		if (jform_vvvvvzzvzp_required)
 		{
-			updateFieldRequired('add_php_after_getitems',0);
-			jQuery('#jform_add_php_after_getitems').prop('required','required');
-			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
-			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvwaavzp_required = false;
-		}
-		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		// add required attribute to add_php_before_getitems field
-		if (jform_vvvvwaavzq_required)
-		{
-			updateFieldRequired('add_php_before_getitems',0);
-			jQuery('#jform_add_php_before_getitems').prop('required','required');
-			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
-			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvwaavzq_required = false;
-		}
-		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		// add required attribute to add_php_getlistquery field
-		if (jform_vvvvwaavzr_required)
-		{
-			updateFieldRequired('add_php_getlistquery',0);
-			jQuery('#jform_add_php_getlistquery').prop('required','required');
-			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
-			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvwaavzr_required = false;
+			updateFieldRequired('php_after_getitems',0);
+			jQuery('#jform_php_after_getitems').prop('required','required');
+			jQuery('#jform_php_after_getitems').attr('aria-required',true);
+			jQuery('#jform_php_after_getitems').addClass('required');
+			jform_vvvvvzzvzp_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		// remove required attribute from add_php_after_getitems field
-		if (!jform_vvvvwaavzp_required)
+		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
+		// remove required attribute from php_after_getitems field
+		if (!jform_vvvvvzzvzp_required)
 		{
-			updateFieldRequired('add_php_after_getitems',1);
-			jQuery('#jform_add_php_after_getitems').removeAttr('required');
-			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
-			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvwaavzp_required = true;
-		}
-		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		// remove required attribute from add_php_before_getitems field
-		if (!jform_vvvvwaavzq_required)
-		{
-			updateFieldRequired('add_php_before_getitems',1);
-			jQuery('#jform_add_php_before_getitems').removeAttr('required');
-			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
-			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvwaavzq_required = true;
-		}
-		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		// remove required attribute from add_php_getlistquery field
-		if (!jform_vvvvwaavzr_required)
-		{
-			updateFieldRequired('add_php_getlistquery',1);
-			jQuery('#jform_add_php_getlistquery').removeAttr('required');
-			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
-			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvwaavzr_required = true;
+			updateFieldRequired('php_after_getitems',1);
+			jQuery('#jform_php_after_getitems').removeAttr('required');
+			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
+			jQuery('#jform_php_after_getitems').removeClass('required');
+			jform_vvvvvzzvzp_required = true;
 		}
 	}
 }
 
-// the vvvvwaa Some function
-function gettype_vvvvwaa_SomeFunc(gettype_vvvvwaa)
+// the vvvvvzz Some function
+function add_php_after_getitems_vvvvvzz_SomeFunc(add_php_after_getitems_vvvvvzz)
 {
 	// set the function logic
-	if (gettype_vvvvwaa == 2 || gettype_vvvvwaa == 4)
+	if (add_php_after_getitems_vvvvvzz == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzz Some function
+function gettype_vvvvvzz_SomeFunc(gettype_vvvvvzz)
+{
+	// set the function logic
+	if (gettype_vvvvvzz == 2 || gettype_vvvvvzz == 4)
 	{
 		return true;
 	}
@@ -1272,27 +1176,67 @@ function vvvvwab(gettype_vvvvwab)
 	// set this function logic
 	if (gettype)
 	{
-		jQuery('#jform_pagination').closest('.control-group').show();
-		// add required attribute to pagination field
+		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
+		// add required attribute to add_php_after_getitems field
+		if (jform_vvvvwabvzq_required)
+		{
+			updateFieldRequired('add_php_after_getitems',0);
+			jQuery('#jform_add_php_after_getitems').prop('required','required');
+			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
+			jQuery('#jform_add_php_after_getitems').addClass('required');
+			jform_vvvvwabvzq_required = false;
+		}
+		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
+		// add required attribute to add_php_before_getitems field
+		if (jform_vvvvwabvzr_required)
+		{
+			updateFieldRequired('add_php_before_getitems',0);
+			jQuery('#jform_add_php_before_getitems').prop('required','required');
+			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
+			jQuery('#jform_add_php_before_getitems').addClass('required');
+			jform_vvvvwabvzr_required = false;
+		}
+		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
+		// add required attribute to add_php_getlistquery field
 		if (jform_vvvvwabvzs_required)
 		{
-			updateFieldRequired('pagination',0);
-			jQuery('#jform_pagination').prop('required','required');
-			jQuery('#jform_pagination').attr('aria-required',true);
-			jQuery('#jform_pagination').addClass('required');
+			updateFieldRequired('add_php_getlistquery',0);
+			jQuery('#jform_add_php_getlistquery').prop('required','required');
+			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
+			jQuery('#jform_add_php_getlistquery').addClass('required');
 			jform_vvvvwabvzs_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_pagination').closest('.control-group').hide();
-		// remove required attribute from pagination field
+		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
+		// remove required attribute from add_php_after_getitems field
+		if (!jform_vvvvwabvzq_required)
+		{
+			updateFieldRequired('add_php_after_getitems',1);
+			jQuery('#jform_add_php_after_getitems').removeAttr('required');
+			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
+			jQuery('#jform_add_php_after_getitems').removeClass('required');
+			jform_vvvvwabvzq_required = true;
+		}
+		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
+		// remove required attribute from add_php_before_getitems field
+		if (!jform_vvvvwabvzr_required)
+		{
+			updateFieldRequired('add_php_before_getitems',1);
+			jQuery('#jform_add_php_before_getitems').removeAttr('required');
+			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
+			jQuery('#jform_add_php_before_getitems').removeClass('required');
+			jform_vvvvwabvzr_required = true;
+		}
+		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
+		// remove required attribute from add_php_getlistquery field
 		if (!jform_vvvvwabvzs_required)
 		{
-			updateFieldRequired('pagination',1);
-			jQuery('#jform_pagination').removeAttr('required');
-			jQuery('#jform_pagination').removeAttr('aria-required');
-			jQuery('#jform_pagination').removeClass('required');
+			updateFieldRequired('add_php_getlistquery',1);
+			jQuery('#jform_add_php_getlistquery').removeAttr('required');
+			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
+			jQuery('#jform_add_php_getlistquery').removeClass('required');
 			jform_vvvvwabvzs_required = true;
 		}
 	}
@@ -1302,7 +1246,7 @@ function vvvvwab(gettype_vvvvwab)
 function gettype_vvvvwab_SomeFunc(gettype_vvvvwab)
 {
 	// set the function logic
-	if (gettype_vvvvwab == 2)
+	if (gettype_vvvvwab == 2 || gettype_vvvvwab == 4)
 	{
 		return true;
 	}
@@ -1328,27 +1272,27 @@ function vvvvwac(gettype_vvvvwac)
 	// set this function logic
 	if (gettype)
 	{
-		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
-		// add required attribute to add_php_router_parse field
+		jQuery('#jform_pagination').closest('.control-group').show();
+		// add required attribute to pagination field
 		if (jform_vvvvwacvzt_required)
 		{
-			updateFieldRequired('add_php_router_parse',0);
-			jQuery('#jform_add_php_router_parse').prop('required','required');
-			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
-			jQuery('#jform_add_php_router_parse').addClass('required');
+			updateFieldRequired('pagination',0);
+			jQuery('#jform_pagination').prop('required','required');
+			jQuery('#jform_pagination').attr('aria-required',true);
+			jQuery('#jform_pagination').addClass('required');
 			jform_vvvvwacvzt_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
-		// remove required attribute from add_php_router_parse field
+		jQuery('#jform_pagination').closest('.control-group').hide();
+		// remove required attribute from pagination field
 		if (!jform_vvvvwacvzt_required)
 		{
-			updateFieldRequired('add_php_router_parse',1);
-			jQuery('#jform_add_php_router_parse').removeAttr('required');
-			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
-			jQuery('#jform_add_php_router_parse').removeClass('required');
+			updateFieldRequired('pagination',1);
+			jQuery('#jform_pagination').removeAttr('required');
+			jQuery('#jform_pagination').removeAttr('aria-required');
+			jQuery('#jform_pagination').removeClass('required');
 			jform_vvvvwacvzt_required = true;
 		}
 	}
@@ -1358,7 +1302,7 @@ function vvvvwac(gettype_vvvvwac)
 function gettype_vvvvwac_SomeFunc(gettype_vvvvwac)
 {
 	// set the function logic
-	if (gettype_vvvvwac == 1 || gettype_vvvvwac == 2)
+	if (gettype_vvvvwac == 2)
 	{
 		return true;
 	}
@@ -1366,7 +1310,7 @@ function gettype_vvvvwac_SomeFunc(gettype_vvvvwac)
 }
 
 // the vvvvwad function
-function vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad)
+function vvvvwad(gettype_vvvvwad)
 {
 	if (isSet(gettype_vvvvwad) && gettype_vvvvwad.constructor !== Array)
 	{
@@ -1380,43 +1324,31 @@ function vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad)
 	}
 	var gettype = gettype_vvvvwad.some(gettype_vvvvwad_SomeFunc);
 
-	if (isSet(add_php_router_parse_vvvvwad) && add_php_router_parse_vvvvwad.constructor !== Array)
-	{
-		var temp_vvvvwad = add_php_router_parse_vvvvwad;
-		var add_php_router_parse_vvvvwad = [];
-		add_php_router_parse_vvvvwad.push(temp_vvvvwad);
-	}
-	else if (!isSet(add_php_router_parse_vvvvwad))
-	{
-		var add_php_router_parse_vvvvwad = [];
-	}
-	var add_php_router_parse = add_php_router_parse_vvvvwad.some(add_php_router_parse_vvvvwad_SomeFunc);
-
 
 	// set this function logic
-	if (gettype && add_php_router_parse)
+	if (gettype)
 	{
-		jQuery('#jform_php_router_parse').closest('.control-group').show();
-		// add required attribute to php_router_parse field
+		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
+		// add required attribute to add_php_router_parse field
 		if (jform_vvvvwadvzu_required)
 		{
-			updateFieldRequired('php_router_parse',0);
-			jQuery('#jform_php_router_parse').prop('required','required');
-			jQuery('#jform_php_router_parse').attr('aria-required',true);
-			jQuery('#jform_php_router_parse').addClass('required');
+			updateFieldRequired('add_php_router_parse',0);
+			jQuery('#jform_add_php_router_parse').prop('required','required');
+			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
+			jQuery('#jform_add_php_router_parse').addClass('required');
 			jform_vvvvwadvzu_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_router_parse').closest('.control-group').hide();
-		// remove required attribute from php_router_parse field
+		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
+		// remove required attribute from add_php_router_parse field
 		if (!jform_vvvvwadvzu_required)
 		{
-			updateFieldRequired('php_router_parse',1);
-			jQuery('#jform_php_router_parse').removeAttr('required');
-			jQuery('#jform_php_router_parse').removeAttr('aria-required');
-			jQuery('#jform_php_router_parse').removeClass('required');
+			updateFieldRequired('add_php_router_parse',1);
+			jQuery('#jform_add_php_router_parse').removeAttr('required');
+			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
+			jQuery('#jform_add_php_router_parse').removeClass('required');
 			jform_vvvvwadvzu_required = true;
 		}
 	}
@@ -1433,31 +1365,99 @@ function gettype_vvvvwad_SomeFunc(gettype_vvvvwad)
 	return false;
 }
 
-// the vvvvwad Some function
-function add_php_router_parse_vvvvwad_SomeFunc(add_php_router_parse_vvvvwad)
+// the vvvvwae function
+function vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae)
+{
+	if (isSet(gettype_vvvvwae) && gettype_vvvvwae.constructor !== Array)
+	{
+		var temp_vvvvwae = gettype_vvvvwae;
+		var gettype_vvvvwae = [];
+		gettype_vvvvwae.push(temp_vvvvwae);
+	}
+	else if (!isSet(gettype_vvvvwae))
+	{
+		var gettype_vvvvwae = [];
+	}
+	var gettype = gettype_vvvvwae.some(gettype_vvvvwae_SomeFunc);
+
+	if (isSet(add_php_router_parse_vvvvwae) && add_php_router_parse_vvvvwae.constructor !== Array)
+	{
+		var temp_vvvvwae = add_php_router_parse_vvvvwae;
+		var add_php_router_parse_vvvvwae = [];
+		add_php_router_parse_vvvvwae.push(temp_vvvvwae);
+	}
+	else if (!isSet(add_php_router_parse_vvvvwae))
+	{
+		var add_php_router_parse_vvvvwae = [];
+	}
+	var add_php_router_parse = add_php_router_parse_vvvvwae.some(add_php_router_parse_vvvvwae_SomeFunc);
+
+
+	// set this function logic
+	if (gettype && add_php_router_parse)
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').show();
+		// add required attribute to php_router_parse field
+		if (jform_vvvvwaevzv_required)
+		{
+			updateFieldRequired('php_router_parse',0);
+			jQuery('#jform_php_router_parse').prop('required','required');
+			jQuery('#jform_php_router_parse').attr('aria-required',true);
+			jQuery('#jform_php_router_parse').addClass('required');
+			jform_vvvvwaevzv_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').hide();
+		// remove required attribute from php_router_parse field
+		if (!jform_vvvvwaevzv_required)
+		{
+			updateFieldRequired('php_router_parse',1);
+			jQuery('#jform_php_router_parse').removeAttr('required');
+			jQuery('#jform_php_router_parse').removeAttr('aria-required');
+			jQuery('#jform_php_router_parse').removeClass('required');
+			jform_vvvvwaevzv_required = true;
+		}
+	}
+}
+
+// the vvvvwae Some function
+function gettype_vvvvwae_SomeFunc(gettype_vvvvwae)
 {
 	// set the function logic
-	if (add_php_router_parse_vvvvwad == 1)
+	if (gettype_vvvvwae == 1 || gettype_vvvvwae == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwaf function
-function vvvvwaf(gettype_vvvvwaf)
+// the vvvvwae Some function
+function add_php_router_parse_vvvvwae_SomeFunc(add_php_router_parse_vvvvwae)
 {
-	if (isSet(gettype_vvvvwaf) && gettype_vvvvwaf.constructor !== Array)
+	// set the function logic
+	if (add_php_router_parse_vvvvwae == 1)
 	{
-		var temp_vvvvwaf = gettype_vvvvwaf;
-		var gettype_vvvvwaf = [];
-		gettype_vvvvwaf.push(temp_vvvvwaf);
+		return true;
 	}
-	else if (!isSet(gettype_vvvvwaf))
+	return false;
+}
+
+// the vvvvwag function
+function vvvvwag(gettype_vvvvwag)
+{
+	if (isSet(gettype_vvvvwag) && gettype_vvvvwag.constructor !== Array)
 	{
-		var gettype_vvvvwaf = [];
+		var temp_vvvvwag = gettype_vvvvwag;
+		var gettype_vvvvwag = [];
+		gettype_vvvvwag.push(temp_vvvvwag);
 	}
-	var gettype = gettype_vvvvwaf.some(gettype_vvvvwaf_SomeFunc);
+	else if (!isSet(gettype_vvvvwag))
+	{
+		var gettype_vvvvwag = [];
+	}
+	var gettype = gettype_vvvvwag.some(gettype_vvvvwag_SomeFunc);
 
 
 	// set this function logic
@@ -1471,11 +1471,11 @@ function vvvvwaf(gettype_vvvvwaf)
 	}
 }
 
-// the vvvvwaf Some function
-function gettype_vvvvwaf_SomeFunc(gettype_vvvvwaf)
+// the vvvvwag Some function
+function gettype_vvvvwag_SomeFunc(gettype_vvvvwag)
 {
 	// set the function logic
-	if (gettype_vvvvwaf == 1)
+	if (gettype_vvvvwag == 1)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index b0d87bb6f..8791d8d4f 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -9,61 +9,61 @@
  */
 
 // Some Global Values
-jform_vvvvwaswab_required = false;
 jform_vvvvwatwac_required = false;
 jform_vvvvwauwad_required = false;
 jform_vvvvwavwae_required = false;
-jform_vvvvwaywaf_required = false;
+jform_vvvvwawwaf_required = false;
 jform_vvvvwazwag_required = false;
 jform_vvvvwbawah_required = false;
 jform_vvvvwbbwai_required = false;
+jform_vvvvwbcwaj_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
-	vvvvwas(datalenght_vvvvwas);
+	var datalenght_vvvvwat = jQuery("#jform_datalenght").val();
+	vvvvwat(datalenght_vvvvwat);
 
-	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
-	vvvvwat(datadefault_vvvvwat);
-
-	var datatype_vvvvwau = jQuery("#jform_datatype").val();
-	vvvvwau(datatype_vvvvwau);
+	var datadefault_vvvvwau = jQuery("#jform_datadefault").val();
+	vvvvwau(datadefault_vvvvwau);
 
 	var datatype_vvvvwav = jQuery("#jform_datatype").val();
 	vvvvwav(datatype_vvvvwav);
 
-	var store_vvvvwaw = jQuery("#jform_store").val();
 	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+	vvvvwaw(datatype_vvvvwaw);
 
-	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvway(add_css_view_vvvvway);
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
 
-	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaz(add_css_views_vvvvwaz);
+	var add_css_view_vvvvwaz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwaz(add_css_view_vvvvwaz);
 
-	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_view_footer_vvvvwba);
+	var add_css_views_vvvvwba = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwba(add_css_views_vvvvwba);
 
-	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwbb(add_javascript_views_footer_vvvvwbb);
+	var add_javascript_view_footer_vvvvwbb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwbb(add_javascript_view_footer_vvvvwbb);
+
+	var add_javascript_views_footer_vvvvwbc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbc(add_javascript_views_footer_vvvvwbc);
 });
 
-// the vvvvwas function
-function vvvvwas(datalenght_vvvvwas)
+// the vvvvwat function
+function vvvvwat(datalenght_vvvvwat)
 {
-	if (isSet(datalenght_vvvvwas) && datalenght_vvvvwas.constructor !== Array)
+	if (isSet(datalenght_vvvvwat) && datalenght_vvvvwat.constructor !== Array)
 	{
-		var temp_vvvvwas = datalenght_vvvvwas;
-		var datalenght_vvvvwas = [];
-		datalenght_vvvvwas.push(temp_vvvvwas);
+		var temp_vvvvwat = datalenght_vvvvwat;
+		var datalenght_vvvvwat = [];
+		datalenght_vvvvwat.push(temp_vvvvwat);
 	}
-	else if (!isSet(datalenght_vvvvwas))
+	else if (!isSet(datalenght_vvvvwat))
 	{
-		var datalenght_vvvvwas = [];
+		var datalenght_vvvvwat = [];
 	}
-	var datalenght = datalenght_vvvvwas.some(datalenght_vvvvwas_SomeFunc);
+	var datalenght = datalenght_vvvvwat.some(datalenght_vvvvwat_SomeFunc);
 
 
 	// set this function logic
@@ -71,91 +71,35 @@ function vvvvwas(datalenght_vvvvwas)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwaswab_required)
+		if (jform_vvvvwatwac_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwaswab_required = false;
+			jform_vvvvwatwac_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwaswab_required)
+		if (!jform_vvvvwatwac_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwaswab_required = true;
-		}
-	}
-}
-
-// the vvvvwas Some function
-function datalenght_vvvvwas_SomeFunc(datalenght_vvvvwas)
-{
-	// set the function logic
-	if (datalenght_vvvvwas == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwat function
-function vvvvwat(datadefault_vvvvwat)
-{
-	if (isSet(datadefault_vvvvwat) && datadefault_vvvvwat.constructor !== Array)
-	{
-		var temp_vvvvwat = datadefault_vvvvwat;
-		var datadefault_vvvvwat = [];
-		datadefault_vvvvwat.push(temp_vvvvwat);
-	}
-	else if (!isSet(datadefault_vvvvwat))
-	{
-		var datadefault_vvvvwat = [];
-	}
-	var datadefault = datadefault_vvvvwat.some(datadefault_vvvvwat_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		// add required attribute to datadefault_other field
-		if (jform_vvvvwatwac_required)
-		{
-			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwatwac_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwatwac_required)
-		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwatwac_required = true;
 		}
 	}
 }
 
 // the vvvvwat Some function
-function datadefault_vvvvwat_SomeFunc(datadefault_vvvvwat)
+function datalenght_vvvvwat_SomeFunc(datalenght_vvvvwat)
 {
 	// set the function logic
-	if (datadefault_vvvvwat == 'Other')
+	if (datalenght_vvvvwat == 'Other')
 	{
 		return true;
 	}
@@ -163,59 +107,55 @@ function datadefault_vvvvwat_SomeFunc(datadefault_vvvvwat)
 }
 
 // the vvvvwau function
-function vvvvwau(datatype_vvvvwau)
+function vvvvwau(datadefault_vvvvwau)
 {
-	if (isSet(datatype_vvvvwau) && datatype_vvvvwau.constructor !== Array)
+	if (isSet(datadefault_vvvvwau) && datadefault_vvvvwau.constructor !== Array)
 	{
-		var temp_vvvvwau = datatype_vvvvwau;
-		var datatype_vvvvwau = [];
-		datatype_vvvvwau.push(temp_vvvvwau);
+		var temp_vvvvwau = datadefault_vvvvwau;
+		var datadefault_vvvvwau = [];
+		datadefault_vvvvwau.push(temp_vvvvwau);
 	}
-	else if (!isSet(datatype_vvvvwau))
+	else if (!isSet(datadefault_vvvvwau))
 	{
-		var datatype_vvvvwau = [];
+		var datadefault_vvvvwau = [];
 	}
-	var datatype = datatype_vvvvwau.some(datatype_vvvvwau_SomeFunc);
+	var datadefault = datadefault_vvvvwau.some(datadefault_vvvvwau_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
+		// add required attribute to datadefault_other field
 		if (jform_vvvvwauwad_required)
 		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
+			updateFieldRequired('datadefault_other',0);
+			jQuery('#jform_datadefault_other').prop('required','required');
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwauwad_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		// remove required attribute from indexes field
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
+		// remove required attribute from datadefault_other field
 		if (!jform_vvvvwauwad_required)
 		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			updateFieldRequired('datadefault_other',1);
+			jQuery('#jform_datadefault_other').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwauwad_required = true;
 		}
 	}
 }
 
 // the vvvvwau Some function
-function datatype_vvvvwau_SomeFunc(datatype_vvvvwau)
+function datadefault_vvvvwau_SomeFunc(datadefault_vvvvwau)
 {
 	// set the function logic
-	if (datatype_vvvvwau == 'CHAR' || datatype_vvvvwau == 'VARCHAR' || datatype_vvvvwau == 'DATETIME' || datatype_vvvvwau == 'DATE' || datatype_vvvvwau == 'TIME' || datatype_vvvvwau == 'INT' || datatype_vvvvwau == 'TINYINT' || datatype_vvvvwau == 'BIGINT' || datatype_vvvvwau == 'FLOAT' || datatype_vvvvwau == 'DECIMAL' || datatype_vvvvwau == 'DOUBLE')
+	if (datadefault_vvvvwau == 'Other')
 	{
 		return true;
 	}
@@ -241,27 +181,31 @@ function vvvvwav(datatype_vvvvwav)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
 		if (jform_vvvvwavwae_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwavwae_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
 		if (!jform_vvvvwavwae_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwavwae_required = true;
 		}
 	}
@@ -271,7 +215,7 @@ function vvvvwav(datatype_vvvvwav)
 function datatype_vvvvwav_SomeFunc(datatype_vvvvwav)
 {
 	// set the function logic
-	if (datatype_vvvvwav == 'CHAR' || datatype_vvvvwav == 'VARCHAR' || datatype_vvvvwav == 'TEXT' || datatype_vvvvwav == 'MEDIUMTEXT' || datatype_vvvvwav == 'LONGTEXT' || datatype_vvvvwav == 'BLOB' || datatype_vvvvwav == 'TINYBLOB' || datatype_vvvvwav == 'MEDIUMBLOB' || datatype_vvvvwav == 'LONGBLOB')
+	if (datatype_vvvvwav == 'CHAR' || datatype_vvvvwav == 'VARCHAR' || datatype_vvvvwav == 'DATETIME' || datatype_vvvvwav == 'DATE' || datatype_vvvvwav == 'TIME' || datatype_vvvvwav == 'INT' || datatype_vvvvwav == 'TINYINT' || datatype_vvvvwav == 'BIGINT' || datatype_vvvvwav == 'FLOAT' || datatype_vvvvwav == 'DECIMAL' || datatype_vvvvwav == 'DOUBLE')
 	{
 		return true;
 	}
@@ -279,20 +223,8 @@ function datatype_vvvvwav_SomeFunc(datatype_vvvvwav)
 }
 
 // the vvvvwaw function
-function vvvvwaw(store_vvvvwaw,datatype_vvvvwaw)
+function vvvvwaw(datatype_vvvvwaw)
 {
-	if (isSet(store_vvvvwaw) && store_vvvvwaw.constructor !== Array)
-	{
-		var temp_vvvvwaw = store_vvvvwaw;
-		var store_vvvvwaw = [];
-		store_vvvvwaw.push(temp_vvvvwaw);
-	}
-	else if (!isSet(store_vvvvwaw))
-	{
-		var store_vvvvwaw = [];
-	}
-	var store = store_vvvvwaw.some(store_vvvvwaw_SomeFunc);
-
 	if (isSet(datatype_vvvvwaw) && datatype_vvvvwaw.constructor !== Array)
 	{
 		var temp_vvvvwaw = datatype_vvvvwaw;
@@ -307,27 +239,34 @@ function vvvvwaw(store_vvvvwaw,datatype_vvvvwaw)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwawwaf_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwawwaf_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		// remove required attribute from store field
+		if (!jform_vvvvwawwaf_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwawwaf_required = true;
+		}
 	}
 }
 
-// the vvvvwaw Some function
-function store_vvvvwaw_SomeFunc(store_vvvvwaw)
-{
-	// set the function logic
-	if (store_vvvvwaw == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaw Some function
 function datatype_vvvvwaw_SomeFunc(datatype_vvvvwaw)
 {
@@ -339,130 +278,191 @@ function datatype_vvvvwaw_SomeFunc(datatype_vvvvwaw)
 	return false;
 }
 
-// the vvvvway function
-function vvvvway(add_css_view_vvvvway)
+// the vvvvwax function
+function vvvvwax(store_vvvvwax,datatype_vvvvwax)
+{
+	if (isSet(store_vvvvwax) && store_vvvvwax.constructor !== Array)
+	{
+		var temp_vvvvwax = store_vvvvwax;
+		var store_vvvvwax = [];
+		store_vvvvwax.push(temp_vvvvwax);
+	}
+	else if (!isSet(store_vvvvwax))
+	{
+		var store_vvvvwax = [];
+	}
+	var store = store_vvvvwax.some(store_vvvvwax_SomeFunc);
+
+	if (isSet(datatype_vvvvwax) && datatype_vvvvwax.constructor !== Array)
+	{
+		var temp_vvvvwax = datatype_vvvvwax;
+		var datatype_vvvvwax = [];
+		datatype_vvvvwax.push(temp_vvvvwax);
+	}
+	else if (!isSet(datatype_vvvvwax))
+	{
+		var datatype_vvvvwax = [];
+	}
+	var datatype = datatype_vvvvwax.some(datatype_vvvvwax_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwax Some function
+function store_vvvvwax_SomeFunc(store_vvvvwax)
 {
 	// set the function logic
-	if (add_css_view_vvvvway == 1)
+	if (store_vvvvwax == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwax Some function
+function datatype_vvvvwax_SomeFunc(datatype_vvvvwax)
+{
+	// set the function logic
+	if (datatype_vvvvwax == 'CHAR' || datatype_vvvvwax == 'VARCHAR' || datatype_vvvvwax == 'TEXT' || datatype_vvvvwax == 'MEDIUMTEXT' || datatype_vvvvwax == 'LONGTEXT' || datatype_vvvvwax == 'BLOB' || datatype_vvvvwax == 'TINYBLOB' || datatype_vvvvwax == 'MEDIUMBLOB' || datatype_vvvvwax == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaz function
+function vvvvwaz(add_css_view_vvvvwaz)
+{
+	// set the function logic
+	if (add_css_view_vvvvwaz == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 		// add required attribute to css_view field
-		if (jform_vvvvwaywaf_required)
+		if (jform_vvvvwazwag_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwaywaf_required = false;
+			jform_vvvvwazwag_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
 		// remove required attribute from css_view field
-		if (!jform_vvvvwaywaf_required)
+		if (!jform_vvvvwazwag_required)
 		{
 			updateFieldRequired('css_view',1);
 			jQuery('#jform_css_view').removeAttr('required');
 			jQuery('#jform_css_view').removeAttr('aria-required');
 			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwaywaf_required = true;
-		}
-	}
-}
-
-// the vvvvwaz function
-function vvvvwaz(add_css_views_vvvvwaz)
-{
-	// set the function logic
-	if (add_css_views_vvvvwaz == 1)
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		// add required attribute to css_views field
-		if (jform_vvvvwazwag_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwazwag_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
-		// remove required attribute from css_views field
-		if (!jform_vvvvwazwag_required)
-		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwazwag_required = true;
 		}
 	}
 }
 
 // the vvvvwba function
-function vvvvwba(add_javascript_view_footer_vvvvwba)
+function vvvvwba(add_css_views_vvvvwba)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwba == 1)
+	if (add_css_views_vvvvwba == 1)
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
-		// add required attribute to javascript_view_footer field
+		jQuery('#jform_css_views-lbl').closest('.control-group').show();
+		// add required attribute to css_views field
 		if (jform_vvvvwbawah_required)
 		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
+			updateFieldRequired('css_views',0);
+			jQuery('#jform_css_views').prop('required','required');
+			jQuery('#jform_css_views').attr('aria-required',true);
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwbawah_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_view_footer field
+		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
+		// remove required attribute from css_views field
 		if (!jform_vvvvwbawah_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwbawah_required = true;
 		}
 	}
 }
 
 // the vvvvwbb function
-function vvvvwbb(add_javascript_views_footer_vvvvwbb)
+function vvvvwbb(add_javascript_view_footer_vvvvwbb)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwbb == 1)
+	if (add_javascript_view_footer_vvvvwbb == 1)
+	{
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
+		// add required attribute to javascript_view_footer field
+		if (jform_vvvvwbbwai_required)
+		{
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
+			jform_vvvvwbbwai_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_view_footer field
+		if (!jform_vvvvwbbwai_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwbbwai_required = true;
+		}
+	}
+}
+
+// the vvvvwbc function
+function vvvvwbc(add_javascript_views_footer_vvvvwbc)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwbc == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 		// add required attribute to javascript_views_footer field
-		if (jform_vvvvwbbwai_required)
+		if (jform_vvvvwbcwaj_required)
 		{
 			updateFieldRequired('javascript_views_footer',0);
 			jQuery('#jform_javascript_views_footer').prop('required','required');
 			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwbbwai_required = false;
+			jform_vvvvwbcwaj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
 		// remove required attribute from javascript_views_footer field
-		if (!jform_vvvvwbbwai_required)
+		if (!jform_vvvvwbcwaj_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwbbwai_required = true;
+			jform_vvvvwbcwaj_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js
index 052268414..1c20f92c3 100644
--- a/admin/models/forms/fieldtype.js
+++ b/admin/models/forms/fieldtype.js
@@ -9,82 +9,82 @@
  */
 
 // Some Global Values
-jform_vvvvwbcwaj_required = false;
-jform_vvvvwbewak_required = false;
-jform_vvvvwbgwal_required = false;
+jform_vvvvwbdwak_required = false;
+jform_vvvvwbfwal_required = false;
 jform_vvvvwbhwam_required = false;
 jform_vvvvwbiwan_required = false;
-jform_vvvvwbnwao_required = false;
-jform_vvvvwbnwap_required = false;
+jform_vvvvwbjwao_required = false;
+jform_vvvvwbowap_required = false;
+jform_vvvvwbowaq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
 
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
 	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
 
 	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbn(has_defaults_vvvvwbn);
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+	var has_defaults_vvvvwbo = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbo(has_defaults_vvvvwbo);
 });
 
-// the vvvvwbc function
-function vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc)
+// the vvvvwbd function
+function vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd)
 {
-	if (isSet(datalenght_vvvvwbc) && datalenght_vvvvwbc.constructor !== Array)
+	if (isSet(datalenght_vvvvwbd) && datalenght_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = datalenght_vvvvwbc;
-		var datalenght_vvvvwbc = [];
-		datalenght_vvvvwbc.push(temp_vvvvwbc);
+		var temp_vvvvwbd = datalenght_vvvvwbd;
+		var datalenght_vvvvwbd = [];
+		datalenght_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(datalenght_vvvvwbc))
+	else if (!isSet(datalenght_vvvvwbd))
 	{
-		var datalenght_vvvvwbc = [];
+		var datalenght_vvvvwbd = [];
 	}
-	var datalenght = datalenght_vvvvwbc.some(datalenght_vvvvwbc_SomeFunc);
+	var datalenght = datalenght_vvvvwbd.some(datalenght_vvvvwbd_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbc) && has_defaults_vvvvwbc.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbd) && has_defaults_vvvvwbd.constructor !== Array)
 	{
-		var temp_vvvvwbc = has_defaults_vvvvwbc;
-		var has_defaults_vvvvwbc = [];
-		has_defaults_vvvvwbc.push(temp_vvvvwbc);
+		var temp_vvvvwbd = has_defaults_vvvvwbd;
+		var has_defaults_vvvvwbd = [];
+		has_defaults_vvvvwbd.push(temp_vvvvwbd);
 	}
-	else if (!isSet(has_defaults_vvvvwbc))
+	else if (!isSet(has_defaults_vvvvwbd))
 	{
-		var has_defaults_vvvvwbc = [];
+		var has_defaults_vvvvwbd = [];
 	}
-	var has_defaults = has_defaults_vvvvwbc.some(has_defaults_vvvvwbc_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbd.some(has_defaults_vvvvwbd_SomeFunc);
 
 
 	// set this function logic
@@ -92,78 +92,78 @@ function vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwbcwaj_required)
+		if (jform_vvvvwbdwak_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwbcwaj_required = false;
+			jform_vvvvwbdwak_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwbcwaj_required)
+		if (!jform_vvvvwbdwak_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwbcwaj_required = true;
+			jform_vvvvwbdwak_required = true;
 		}
 	}
 }
 
-// the vvvvwbc Some function
-function datalenght_vvvvwbc_SomeFunc(datalenght_vvvvwbc)
+// the vvvvwbd Some function
+function datalenght_vvvvwbd_SomeFunc(datalenght_vvvvwbd)
 {
 	// set the function logic
-	if (datalenght_vvvvwbc == 'Other')
+	if (datalenght_vvvvwbd == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbc Some function
-function has_defaults_vvvvwbc_SomeFunc(has_defaults_vvvvwbc)
+// the vvvvwbd Some function
+function has_defaults_vvvvwbd_SomeFunc(has_defaults_vvvvwbd)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbc == 1)
+	if (has_defaults_vvvvwbd == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbe function
-function vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe)
+// the vvvvwbf function
+function vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf)
 {
-	if (isSet(datadefault_vvvvwbe) && datadefault_vvvvwbe.constructor !== Array)
+	if (isSet(datadefault_vvvvwbf) && datadefault_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = datadefault_vvvvwbe;
-		var datadefault_vvvvwbe = [];
-		datadefault_vvvvwbe.push(temp_vvvvwbe);
+		var temp_vvvvwbf = datadefault_vvvvwbf;
+		var datadefault_vvvvwbf = [];
+		datadefault_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(datadefault_vvvvwbe))
+	else if (!isSet(datadefault_vvvvwbf))
 	{
-		var datadefault_vvvvwbe = [];
+		var datadefault_vvvvwbf = [];
 	}
-	var datadefault = datadefault_vvvvwbe.some(datadefault_vvvvwbe_SomeFunc);
+	var datadefault = datadefault_vvvvwbf.some(datadefault_vvvvwbf_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbe) && has_defaults_vvvvwbe.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbf) && has_defaults_vvvvwbf.constructor !== Array)
 	{
-		var temp_vvvvwbe = has_defaults_vvvvwbe;
-		var has_defaults_vvvvwbe = [];
-		has_defaults_vvvvwbe.push(temp_vvvvwbe);
+		var temp_vvvvwbf = has_defaults_vvvvwbf;
+		var has_defaults_vvvvwbf = [];
+		has_defaults_vvvvwbf.push(temp_vvvvwbf);
 	}
-	else if (!isSet(has_defaults_vvvvwbe))
+	else if (!isSet(has_defaults_vvvvwbf))
 	{
-		var has_defaults_vvvvwbe = [];
+		var has_defaults_vvvvwbf = [];
 	}
-	var has_defaults = has_defaults_vvvvwbe.some(has_defaults_vvvvwbe_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbf.some(has_defaults_vvvvwbf_SomeFunc);
 
 
 	// set this function logic
@@ -171,129 +171,46 @@ function vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwbewak_required)
+		if (jform_vvvvwbfwal_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwbewak_required = false;
+			jform_vvvvwbfwal_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwbewak_required)
+		if (!jform_vvvvwbfwal_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwbewak_required = true;
+			jform_vvvvwbfwal_required = true;
 		}
 	}
 }
 
-// the vvvvwbe Some function
-function datadefault_vvvvwbe_SomeFunc(datadefault_vvvvwbe)
+// the vvvvwbf Some function
+function datadefault_vvvvwbf_SomeFunc(datadefault_vvvvwbf)
 {
 	// set the function logic
-	if (datadefault_vvvvwbe == 'Other')
+	if (datadefault_vvvvwbf == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbe Some function
-function has_defaults_vvvvwbe_SomeFunc(has_defaults_vvvvwbe)
+// the vvvvwbf Some function
+function has_defaults_vvvvwbf_SomeFunc(has_defaults_vvvvwbf)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbe == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbg function
-function vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg)
-{
-	if (isSet(datatype_vvvvwbg) && datatype_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = datatype_vvvvwbg;
-		var datatype_vvvvwbg = [];
-		datatype_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(datatype_vvvvwbg))
-	{
-		var datatype_vvvvwbg = [];
-	}
-	var datatype = datatype_vvvvwbg.some(datatype_vvvvwbg_SomeFunc);
-
-	if (isSet(has_defaults_vvvvwbg) && has_defaults_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = has_defaults_vvvvwbg;
-		var has_defaults_vvvvwbg = [];
-		has_defaults_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(has_defaults_vvvvwbg))
-	{
-		var has_defaults_vvvvwbg = [];
-	}
-	var has_defaults = has_defaults_vvvvwbg.some(has_defaults_vvvvwbg_SomeFunc);
-
-
-	// set this function logic
-	if (datatype && has_defaults)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
-		if (jform_vvvvwbgwal_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwbgwal_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		// remove required attribute from indexes field
-		if (!jform_vvvvwbgwal_required)
-		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwbgwal_required = true;
-		}
-	}
-}
-
-// the vvvvwbg Some function
-function datatype_vvvvwbg_SomeFunc(datatype_vvvvwbg)
-{
-	// set the function logic
-	if (datatype_vvvvwbg == 'CHAR' || datatype_vvvvwbg == 'VARCHAR' || datatype_vvvvwbg == 'DATETIME' || datatype_vvvvwbg == 'DATE' || datatype_vvvvwbg == 'TIME' || datatype_vvvvwbg == 'INT' || datatype_vvvvwbg == 'TINYINT' || datatype_vvvvwbg == 'BIGINT' || datatype_vvvvwbg == 'FLOAT' || datatype_vvvvwbg == 'DECIMAL' || datatype_vvvvwbg == 'DOUBLE')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbg Some function
-function has_defaults_vvvvwbg_SomeFunc(has_defaults_vvvvwbg)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbg == 1)
+	if (has_defaults_vvvvwbf == 1)
 	{
 		return true;
 	}
@@ -301,20 +218,8 @@ function has_defaults_vvvvwbg_SomeFunc(has_defaults_vvvvwbg)
 }
 
 // the vvvvwbh function
-function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
+function vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh)
 {
-	if (isSet(has_defaults_vvvvwbh) && has_defaults_vvvvwbh.constructor !== Array)
-	{
-		var temp_vvvvwbh = has_defaults_vvvvwbh;
-		var has_defaults_vvvvwbh = [];
-		has_defaults_vvvvwbh.push(temp_vvvvwbh);
-	}
-	else if (!isSet(has_defaults_vvvvwbh))
-	{
-		var has_defaults_vvvvwbh = [];
-	}
-	var has_defaults = has_defaults_vvvvwbh.some(has_defaults_vvvvwbh_SomeFunc);
-
 	if (isSet(datatype_vvvvwbh) && datatype_vvvvwbh.constructor !== Array)
 	{
 		var temp_vvvvwbh = datatype_vvvvwbh;
@@ -327,9 +232,21 @@ function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
 	}
 	var datatype = datatype_vvvvwbh.some(datatype_vvvvwbh_SomeFunc);
 
+	if (isSet(has_defaults_vvvvwbh) && has_defaults_vvvvwbh.constructor !== Array)
+	{
+		var temp_vvvvwbh = has_defaults_vvvvwbh;
+		var has_defaults_vvvvwbh = [];
+		has_defaults_vvvvwbh.push(temp_vvvvwbh);
+	}
+	else if (!isSet(has_defaults_vvvvwbh))
+	{
+		var has_defaults_vvvvwbh = [];
+	}
+	var has_defaults = has_defaults_vvvvwbh.some(has_defaults_vvvvwbh_SomeFunc);
+
 
 	// set this function logic
-	if (has_defaults && datatype)
+	if (datatype && has_defaults)
 	{
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
@@ -361,17 +278,6 @@ function vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh)
 	}
 }
 
-// the vvvvwbh Some function
-function has_defaults_vvvvwbh_SomeFunc(has_defaults_vvvvwbh)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbh == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbh Some function
 function datatype_vvvvwbh_SomeFunc(datatype_vvvvwbh)
 {
@@ -383,21 +289,20 @@ function datatype_vvvvwbh_SomeFunc(datatype_vvvvwbh)
 	return false;
 }
 
-// the vvvvwbi function
-function vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi)
+// the vvvvwbh Some function
+function has_defaults_vvvvwbh_SomeFunc(has_defaults_vvvvwbh)
 {
-	if (isSet(datatype_vvvvwbi) && datatype_vvvvwbi.constructor !== Array)
+	// set the function logic
+	if (has_defaults_vvvvwbh == 1)
 	{
-		var temp_vvvvwbi = datatype_vvvvwbi;
-		var datatype_vvvvwbi = [];
-		datatype_vvvvwbi.push(temp_vvvvwbi);
+		return true;
 	}
-	else if (!isSet(datatype_vvvvwbi))
-	{
-		var datatype_vvvvwbi = [];
-	}
-	var datatype = datatype_vvvvwbi.some(datatype_vvvvwbi_SomeFunc);
+	return false;
+}
 
+// the vvvvwbi function
+function vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi)
+{
 	if (isSet(has_defaults_vvvvwbi) && has_defaults_vvvvwbi.constructor !== Array)
 	{
 		var temp_vvvvwbi = has_defaults_vvvvwbi;
@@ -410,47 +315,52 @@ function vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi)
 	}
 	var has_defaults = has_defaults_vvvvwbi.some(has_defaults_vvvvwbi_SomeFunc);
 
+	if (isSet(datatype_vvvvwbi) && datatype_vvvvwbi.constructor !== Array)
+	{
+		var temp_vvvvwbi = datatype_vvvvwbi;
+		var datatype_vvvvwbi = [];
+		datatype_vvvvwbi.push(temp_vvvvwbi);
+	}
+	else if (!isSet(datatype_vvvvwbi))
+	{
+		var datatype_vvvvwbi = [];
+	}
+	var datatype = datatype_vvvvwbi.some(datatype_vvvvwbi_SomeFunc);
+
 
 	// set this function logic
-	if (datatype && has_defaults)
+	if (has_defaults && datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
 		if (jform_vvvvwbiwan_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwbiwan_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
 		if (!jform_vvvvwbiwan_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwbiwan_required = true;
 		}
 	}
 }
 
-// the vvvvwbi Some function
-function datatype_vvvvwbi_SomeFunc(datatype_vvvvwbi)
-{
-	// set the function logic
-	if (datatype_vvvvwbi == 'CHAR' || datatype_vvvvwbi == 'VARCHAR' || datatype_vvvvwbi == 'TEXT' || datatype_vvvvwbi == 'MEDIUMTEXT' || datatype_vvvvwbi == 'LONGTEXT' || datatype_vvvvwbi == 'BLOB' || datatype_vvvvwbi == 'TINYBLOB' || datatype_vvvvwbi == 'MEDIUMBLOB' || datatype_vvvvwbi == 'LONGBLOB')
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbi Some function
 function has_defaults_vvvvwbi_SomeFunc(has_defaults_vvvvwbi)
 {
@@ -462,84 +372,90 @@ function has_defaults_vvvvwbi_SomeFunc(has_defaults_vvvvwbi)
 	return false;
 }
 
-// the vvvvwbk function
-function vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk)
+// the vvvvwbi Some function
+function datatype_vvvvwbi_SomeFunc(datatype_vvvvwbi)
 {
-	if (isSet(store_vvvvwbk) && store_vvvvwbk.constructor !== Array)
+	// set the function logic
+	if (datatype_vvvvwbi == 'CHAR' || datatype_vvvvwbi == 'VARCHAR' || datatype_vvvvwbi == 'DATETIME' || datatype_vvvvwbi == 'DATE' || datatype_vvvvwbi == 'TIME' || datatype_vvvvwbi == 'INT' || datatype_vvvvwbi == 'TINYINT' || datatype_vvvvwbi == 'BIGINT' || datatype_vvvvwbi == 'FLOAT' || datatype_vvvvwbi == 'DECIMAL' || datatype_vvvvwbi == 'DOUBLE')
 	{
-		var temp_vvvvwbk = store_vvvvwbk;
-		var store_vvvvwbk = [];
-		store_vvvvwbk.push(temp_vvvvwbk);
+		return true;
 	}
-	else if (!isSet(store_vvvvwbk))
-	{
-		var store_vvvvwbk = [];
-	}
-	var store = store_vvvvwbk.some(store_vvvvwbk_SomeFunc);
+	return false;
+}
 
-	if (isSet(datatype_vvvvwbk) && datatype_vvvvwbk.constructor !== Array)
+// the vvvvwbj function
+function vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj)
+{
+	if (isSet(datatype_vvvvwbj) && datatype_vvvvwbj.constructor !== Array)
 	{
-		var temp_vvvvwbk = datatype_vvvvwbk;
-		var datatype_vvvvwbk = [];
-		datatype_vvvvwbk.push(temp_vvvvwbk);
+		var temp_vvvvwbj = datatype_vvvvwbj;
+		var datatype_vvvvwbj = [];
+		datatype_vvvvwbj.push(temp_vvvvwbj);
 	}
-	else if (!isSet(datatype_vvvvwbk))
+	else if (!isSet(datatype_vvvvwbj))
 	{
-		var datatype_vvvvwbk = [];
+		var datatype_vvvvwbj = [];
 	}
-	var datatype = datatype_vvvvwbk.some(datatype_vvvvwbk_SomeFunc);
+	var datatype = datatype_vvvvwbj.some(datatype_vvvvwbj_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwbk) && has_defaults_vvvvwbk.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbj) && has_defaults_vvvvwbj.constructor !== Array)
 	{
-		var temp_vvvvwbk = has_defaults_vvvvwbk;
-		var has_defaults_vvvvwbk = [];
-		has_defaults_vvvvwbk.push(temp_vvvvwbk);
+		var temp_vvvvwbj = has_defaults_vvvvwbj;
+		var has_defaults_vvvvwbj = [];
+		has_defaults_vvvvwbj.push(temp_vvvvwbj);
 	}
-	else if (!isSet(has_defaults_vvvvwbk))
+	else if (!isSet(has_defaults_vvvvwbj))
 	{
-		var has_defaults_vvvvwbk = [];
+		var has_defaults_vvvvwbj = [];
 	}
-	var has_defaults = has_defaults_vvvvwbk.some(has_defaults_vvvvwbk_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbj.some(has_defaults_vvvvwbj_SomeFunc);
 
 
 	// set this function logic
-	if (store && datatype && has_defaults)
+	if (datatype && has_defaults)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		// add required attribute to store field
+		if (jform_vvvvwbjwao_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwbjwao_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		// remove required attribute from store field
+		if (!jform_vvvvwbjwao_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwbjwao_required = true;
+		}
 	}
 }
 
-// the vvvvwbk Some function
-function store_vvvvwbk_SomeFunc(store_vvvvwbk)
+// the vvvvwbj Some function
+function datatype_vvvvwbj_SomeFunc(datatype_vvvvwbj)
 {
 	// set the function logic
-	if (store_vvvvwbk == 4)
+	if (datatype_vvvvwbj == 'CHAR' || datatype_vvvvwbj == 'VARCHAR' || datatype_vvvvwbj == 'TEXT' || datatype_vvvvwbj == 'MEDIUMTEXT' || datatype_vvvvwbj == 'LONGTEXT' || datatype_vvvvwbj == 'BLOB' || datatype_vvvvwbj == 'TINYBLOB' || datatype_vvvvwbj == 'MEDIUMBLOB' || datatype_vvvvwbj == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbk Some function
-function datatype_vvvvwbk_SomeFunc(datatype_vvvvwbk)
+// the vvvvwbj Some function
+function has_defaults_vvvvwbj_SomeFunc(has_defaults_vvvvwbj)
 {
 	// set the function logic
-	if (datatype_vvvvwbk == 'CHAR' || datatype_vvvvwbk == 'VARCHAR' || datatype_vvvvwbk == 'TEXT' || datatype_vvvvwbk == 'MEDIUMTEXT' || datatype_vvvvwbk == 'LONGTEXT' || datatype_vvvvwbk == 'BLOB' || datatype_vvvvwbk == 'TINYBLOB' || datatype_vvvvwbk == 'MEDIUMBLOB' || datatype_vvvvwbk == 'LONGBLOB')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbk Some function
-function has_defaults_vvvvwbk_SomeFunc(has_defaults_vvvvwbk)
-{
-	// set the function logic
-	if (has_defaults_vvvvwbk == 1)
+	if (has_defaults_vvvvwbj == 1)
 	{
 		return true;
 	}
@@ -547,20 +463,8 @@ function has_defaults_vvvvwbk_SomeFunc(has_defaults_vvvvwbk)
 }
 
 // the vvvvwbl function
-function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
+function vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl)
 {
-	if (isSet(datatype_vvvvwbl) && datatype_vvvvwbl.constructor !== Array)
-	{
-		var temp_vvvvwbl = datatype_vvvvwbl;
-		var datatype_vvvvwbl = [];
-		datatype_vvvvwbl.push(temp_vvvvwbl);
-	}
-	else if (!isSet(datatype_vvvvwbl))
-	{
-		var datatype_vvvvwbl = [];
-	}
-	var datatype = datatype_vvvvwbl.some(datatype_vvvvwbl_SomeFunc);
-
 	if (isSet(store_vvvvwbl) && store_vvvvwbl.constructor !== Array)
 	{
 		var temp_vvvvwbl = store_vvvvwbl;
@@ -573,6 +477,18 @@ function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 	}
 	var store = store_vvvvwbl.some(store_vvvvwbl_SomeFunc);
 
+	if (isSet(datatype_vvvvwbl) && datatype_vvvvwbl.constructor !== Array)
+	{
+		var temp_vvvvwbl = datatype_vvvvwbl;
+		var datatype_vvvvwbl = [];
+		datatype_vvvvwbl.push(temp_vvvvwbl);
+	}
+	else if (!isSet(datatype_vvvvwbl))
+	{
+		var datatype_vvvvwbl = [];
+	}
+	var datatype = datatype_vvvvwbl.some(datatype_vvvvwbl_SomeFunc);
+
 	if (isSet(has_defaults_vvvvwbl) && has_defaults_vvvvwbl.constructor !== Array)
 	{
 		var temp_vvvvwbl = has_defaults_vvvvwbl;
@@ -587,7 +503,7 @@ function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 
 
 	// set this function logic
-	if (datatype && store && has_defaults)
+	if (store && datatype && has_defaults)
 	{
 		jQuery('.note_whmcs_encryption').closest('.control-group').show();
 	}
@@ -598,10 +514,10 @@ function vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl)
 }
 
 // the vvvvwbl Some function
-function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
+function store_vvvvwbl_SomeFunc(store_vvvvwbl)
 {
 	// set the function logic
-	if (datatype_vvvvwbl == 'CHAR' || datatype_vvvvwbl == 'VARCHAR' || datatype_vvvvwbl == 'TEXT' || datatype_vvvvwbl == 'MEDIUMTEXT' || datatype_vvvvwbl == 'LONGTEXT' || datatype_vvvvwbl == 'BLOB' || datatype_vvvvwbl == 'TINYBLOB' || datatype_vvvvwbl == 'MEDIUMBLOB' || datatype_vvvvwbl == 'LONGBLOB')
+	if (store_vvvvwbl == 4)
 	{
 		return true;
 	}
@@ -609,10 +525,10 @@ function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
 }
 
 // the vvvvwbl Some function
-function store_vvvvwbl_SomeFunc(store_vvvvwbl)
+function datatype_vvvvwbl_SomeFunc(datatype_vvvvwbl)
 {
 	// set the function logic
-	if (store_vvvvwbl == 4)
+	if (datatype_vvvvwbl == 'CHAR' || datatype_vvvvwbl == 'VARCHAR' || datatype_vvvvwbl == 'TEXT' || datatype_vvvvwbl == 'MEDIUMTEXT' || datatype_vvvvwbl == 'LONGTEXT' || datatype_vvvvwbl == 'BLOB' || datatype_vvvvwbl == 'TINYBLOB' || datatype_vvvvwbl == 'MEDIUMBLOB' || datatype_vvvvwbl == 'LONGBLOB')
 	{
 		return true;
 	}
@@ -631,19 +547,19 @@ function has_defaults_vvvvwbl_SomeFunc(has_defaults_vvvvwbl)
 }
 
 // the vvvvwbm function
-function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
+function vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm)
 {
-	if (isSet(has_defaults_vvvvwbm) && has_defaults_vvvvwbm.constructor !== Array)
+	if (isSet(datatype_vvvvwbm) && datatype_vvvvwbm.constructor !== Array)
 	{
-		var temp_vvvvwbm = has_defaults_vvvvwbm;
-		var has_defaults_vvvvwbm = [];
-		has_defaults_vvvvwbm.push(temp_vvvvwbm);
+		var temp_vvvvwbm = datatype_vvvvwbm;
+		var datatype_vvvvwbm = [];
+		datatype_vvvvwbm.push(temp_vvvvwbm);
 	}
-	else if (!isSet(has_defaults_vvvvwbm))
+	else if (!isSet(datatype_vvvvwbm))
 	{
-		var has_defaults_vvvvwbm = [];
+		var datatype_vvvvwbm = [];
 	}
-	var has_defaults = has_defaults_vvvvwbm.some(has_defaults_vvvvwbm_SomeFunc);
+	var datatype = datatype_vvvvwbm.some(datatype_vvvvwbm_SomeFunc);
 
 	if (isSet(store_vvvvwbm) && store_vvvvwbm.constructor !== Array)
 	{
@@ -657,21 +573,21 @@ function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
 	}
 	var store = store_vvvvwbm.some(store_vvvvwbm_SomeFunc);
 
-	if (isSet(datatype_vvvvwbm) && datatype_vvvvwbm.constructor !== Array)
+	if (isSet(has_defaults_vvvvwbm) && has_defaults_vvvvwbm.constructor !== Array)
 	{
-		var temp_vvvvwbm = datatype_vvvvwbm;
-		var datatype_vvvvwbm = [];
-		datatype_vvvvwbm.push(temp_vvvvwbm);
+		var temp_vvvvwbm = has_defaults_vvvvwbm;
+		var has_defaults_vvvvwbm = [];
+		has_defaults_vvvvwbm.push(temp_vvvvwbm);
 	}
-	else if (!isSet(datatype_vvvvwbm))
+	else if (!isSet(has_defaults_vvvvwbm))
 	{
-		var datatype_vvvvwbm = [];
+		var has_defaults_vvvvwbm = [];
 	}
-	var datatype = datatype_vvvvwbm.some(datatype_vvvvwbm_SomeFunc);
+	var has_defaults = has_defaults_vvvvwbm.some(has_defaults_vvvvwbm_SomeFunc);
 
 
 	// set this function logic
-	if (has_defaults && store && datatype)
+	if (datatype && store && has_defaults)
 	{
 		jQuery('.note_whmcs_encryption').closest('.control-group').show();
 	}
@@ -682,10 +598,10 @@ function vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm)
 }
 
 // the vvvvwbm Some function
-function has_defaults_vvvvwbm_SomeFunc(has_defaults_vvvvwbm)
+function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
 {
 	// set the function logic
-	if (has_defaults_vvvvwbm == 1)
+	if (datatype_vvvvwbm == 'CHAR' || datatype_vvvvwbm == 'VARCHAR' || datatype_vvvvwbm == 'TEXT' || datatype_vvvvwbm == 'MEDIUMTEXT' || datatype_vvvvwbm == 'LONGTEXT' || datatype_vvvvwbm == 'BLOB' || datatype_vvvvwbm == 'TINYBLOB' || datatype_vvvvwbm == 'MEDIUMBLOB' || datatype_vvvvwbm == 'LONGBLOB')
 	{
 		return true;
 	}
@@ -704,10 +620,10 @@ function store_vvvvwbm_SomeFunc(store_vvvvwbm)
 }
 
 // the vvvvwbm Some function
-function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
+function has_defaults_vvvvwbm_SomeFunc(has_defaults_vvvvwbm)
 {
 	// set the function logic
-	if (datatype_vvvvwbm == 'CHAR' || datatype_vvvvwbm == 'VARCHAR' || datatype_vvvvwbm == 'TEXT' || datatype_vvvvwbm == 'MEDIUMTEXT' || datatype_vvvvwbm == 'LONGTEXT' || datatype_vvvvwbm == 'BLOB' || datatype_vvvvwbm == 'TINYBLOB' || datatype_vvvvwbm == 'MEDIUMBLOB' || datatype_vvvvwbm == 'LONGBLOB')
+	if (has_defaults_vvvvwbm == 1)
 	{
 		return true;
 	}
@@ -715,53 +631,137 @@ function datatype_vvvvwbm_SomeFunc(datatype_vvvvwbm)
 }
 
 // the vvvvwbn function
-function vvvvwbn(has_defaults_vvvvwbn)
+function vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn)
+{
+	if (isSet(has_defaults_vvvvwbn) && has_defaults_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = has_defaults_vvvvwbn;
+		var has_defaults_vvvvwbn = [];
+		has_defaults_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(has_defaults_vvvvwbn))
+	{
+		var has_defaults_vvvvwbn = [];
+	}
+	var has_defaults = has_defaults_vvvvwbn.some(has_defaults_vvvvwbn_SomeFunc);
+
+	if (isSet(store_vvvvwbn) && store_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = store_vvvvwbn;
+		var store_vvvvwbn = [];
+		store_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(store_vvvvwbn))
+	{
+		var store_vvvvwbn = [];
+	}
+	var store = store_vvvvwbn.some(store_vvvvwbn_SomeFunc);
+
+	if (isSet(datatype_vvvvwbn) && datatype_vvvvwbn.constructor !== Array)
+	{
+		var temp_vvvvwbn = datatype_vvvvwbn;
+		var datatype_vvvvwbn = [];
+		datatype_vvvvwbn.push(temp_vvvvwbn);
+	}
+	else if (!isSet(datatype_vvvvwbn))
+	{
+		var datatype_vvvvwbn = [];
+	}
+	var datatype = datatype_vvvvwbn.some(datatype_vvvvwbn_SomeFunc);
+
+
+	// set this function logic
+	if (has_defaults && store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbn Some function
+function has_defaults_vvvvwbn_SomeFunc(has_defaults_vvvvwbn)
 {
 	// set the function logic
 	if (has_defaults_vvvvwbn == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbn Some function
+function store_vvvvwbn_SomeFunc(store_vvvvwbn)
+{
+	// set the function logic
+	if (store_vvvvwbn == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbn Some function
+function datatype_vvvvwbn_SomeFunc(datatype_vvvvwbn)
+{
+	// set the function logic
+	if (datatype_vvvvwbn == 'CHAR' || datatype_vvvvwbn == 'VARCHAR' || datatype_vvvvwbn == 'TEXT' || datatype_vvvvwbn == 'MEDIUMTEXT' || datatype_vvvvwbn == 'LONGTEXT' || datatype_vvvvwbn == 'BLOB' || datatype_vvvvwbn == 'TINYBLOB' || datatype_vvvvwbn == 'MEDIUMBLOB' || datatype_vvvvwbn == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbo function
+function vvvvwbo(has_defaults_vvvvwbo)
+{
+	// set the function logic
+	if (has_defaults_vvvvwbo == 1)
 	{
 		jQuery('#jform_datatype').closest('.control-group').show();
 		// add required attribute to datatype field
-		if (jform_vvvvwbnwao_required)
+		if (jform_vvvvwbowap_required)
 		{
 			updateFieldRequired('datatype',0);
 			jQuery('#jform_datatype').prop('required','required');
 			jQuery('#jform_datatype').attr('aria-required',true);
 			jQuery('#jform_datatype').addClass('required');
-			jform_vvvvwbnwao_required = false;
+			jform_vvvvwbowap_required = false;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').show();
 		// add required attribute to null_switch field
-		if (jform_vvvvwbnwap_required)
+		if (jform_vvvvwbowaq_required)
 		{
 			updateFieldRequired('null_switch',0);
 			jQuery('#jform_null_switch').prop('required','required');
 			jQuery('#jform_null_switch').attr('aria-required',true);
 			jQuery('#jform_null_switch').addClass('required');
-			jform_vvvvwbnwap_required = false;
+			jform_vvvvwbowaq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datatype').closest('.control-group').hide();
 		// remove required attribute from datatype field
-		if (!jform_vvvvwbnwao_required)
+		if (!jform_vvvvwbowap_required)
 		{
 			updateFieldRequired('datatype',1);
 			jQuery('#jform_datatype').removeAttr('required');
 			jQuery('#jform_datatype').removeAttr('aria-required');
 			jQuery('#jform_datatype').removeClass('required');
-			jform_vvvvwbnwao_required = true;
+			jform_vvvvwbowap_required = true;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').hide();
 		// remove required attribute from null_switch field
-		if (!jform_vvvvwbnwap_required)
+		if (!jform_vvvvwbowaq_required)
 		{
 			updateFieldRequired('null_switch',1);
 			jQuery('#jform_null_switch').removeAttr('required');
 			jQuery('#jform_null_switch').removeAttr('aria-required');
 			jQuery('#jform_null_switch').removeClass('required');
-			jform_vvvvwbnwap_required = true;
+			jform_vvvvwbowaq_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 672417450..71a6b21b1 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -9,24 +9,21 @@
  */
 
 // Some Global Values
-jform_vvvvwbywbb_required = false;
 jform_vvvvwbzwbc_required = false;
 jform_vvvvwcawbd_required = false;
 jform_vvvvwcbwbe_required = false;
 jform_vvvvwccwbf_required = false;
 jform_vvvvwcdwbg_required = false;
+jform_vvvvwcewbh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwby(location_vvvvwby);
-
 	var location_vvvvwbz = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwbz(location_vvvvwbz);
 
-	var type_vvvvwca = jQuery("#jform_type").val();
-	vvvvwca(type_vvvvwca);
+	var location_vvvvwca = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwca(location_vvvvwca);
 
 	var type_vvvvwcb = jQuery("#jform_type").val();
 	vvvvwcb(type_vvvvwcb);
@@ -34,130 +31,77 @@ jQuery(document).ready(function()
 	var type_vvvvwcc = jQuery("#jform_type").val();
 	vvvvwcc(type_vvvvwcc);
 
-	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcd(target_vvvvwcd);
+	var type_vvvvwcd = jQuery("#jform_type").val();
+	vvvvwcd(type_vvvvwcd);
+
+	var target_vvvvwce = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwce(target_vvvvwce);
 });
 
-// the vvvvwby function
-function vvvvwby(location_vvvvwby)
+// the vvvvwbz function
+function vvvvwbz(location_vvvvwbz)
 {
 	// set the function logic
-	if (location_vvvvwby == 1)
+	if (location_vvvvwbz == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwbywbb_required)
+		if (jform_vvvvwbzwbc_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwbywbb_required = false;
+			jform_vvvvwbzwbc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwbywbb_required)
+		if (!jform_vvvvwbzwbc_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwbywbb_required = true;
-		}
-	}
-}
-
-// the vvvvwbz function
-function vvvvwbz(location_vvvvwbz)
-{
-	// set the function logic
-	if (location_vvvvwbz == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		// add required attribute to site_view field
-		if (jform_vvvvwbzwbc_required)
-		{
-			updateFieldRequired('site_view',0);
-			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwbzwbc_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		// remove required attribute from site_view field
-		if (!jform_vvvvwbzwbc_required)
-		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwbzwbc_required = true;
 		}
 	}
 }
 
 // the vvvvwca function
-function vvvvwca(type_vvvvwca)
+function vvvvwca(location_vvvvwca)
 {
-	if (isSet(type_vvvvwca) && type_vvvvwca.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwca == 2)
 	{
-		var temp_vvvvwca = type_vvvvwca;
-		var type_vvvvwca = [];
-		type_vvvvwca.push(temp_vvvvwca);
-	}
-	else if (!isSet(type_vvvvwca))
-	{
-		var type_vvvvwca = [];
-	}
-	var type = type_vvvvwca.some(type_vvvvwca_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		// add required attribute to url field
+		jQuery('#jform_site_view').closest('.control-group').show();
+		// add required attribute to site_view field
 		if (jform_vvvvwcawbd_required)
 		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
+			updateFieldRequired('site_view',0);
+			jQuery('#jform_site_view').prop('required','required');
+			jQuery('#jform_site_view').attr('aria-required',true);
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwcawbd_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		// remove required attribute from url field
+		jQuery('#jform_site_view').closest('.control-group').hide();
+		// remove required attribute from site_view field
 		if (!jform_vvvvwcawbd_required)
 		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
+			updateFieldRequired('site_view',1);
+			jQuery('#jform_site_view').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwcawbd_required = true;
 		}
 	}
 }
 
-// the vvvvwca Some function
-function type_vvvvwca_SomeFunc(type_vvvvwca)
-{
-	// set the function logic
-	if (type_vvvvwca == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwcb function
 function vvvvwcb(type_vvvvwcb)
 {
@@ -177,27 +121,27 @@ function vvvvwcb(type_vvvvwcb)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
-		// add required attribute to article field
+		jQuery('#jform_url').closest('.control-group').show();
+		// add required attribute to url field
 		if (jform_vvvvwcbwbe_required)
 		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			updateFieldRequired('url',0);
+			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwcbwbe_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
-		// remove required attribute from article field
+		jQuery('#jform_url').closest('.control-group').hide();
+		// remove required attribute from url field
 		if (!jform_vvvvwcbwbe_required)
 		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			updateFieldRequired('url',1);
+			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwcbwbe_required = true;
 		}
 	}
@@ -207,7 +151,7 @@ function vvvvwcb(type_vvvvwcb)
 function type_vvvvwcb_SomeFunc(type_vvvvwcb)
 {
 	// set the function logic
-	if (type_vvvvwcb == 1)
+	if (type_vvvvwcb == 3)
 	{
 		return true;
 	}
@@ -233,27 +177,27 @@ function vvvvwcc(type_vvvvwcc)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
-		// add required attribute to content field
+		jQuery('#jform_article').closest('.control-group').show();
+		// add required attribute to article field
 		if (jform_vvvvwccwbf_required)
 		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwccwbf_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		// remove required attribute from content field
+		jQuery('#jform_article').closest('.control-group').hide();
+		// remove required attribute from article field
 		if (!jform_vvvvwccwbf_required)
 		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
 			jform_vvvvwccwbf_required = true;
 		}
 	}
@@ -263,7 +207,7 @@ function vvvvwcc(type_vvvvwcc)
 function type_vvvvwcc_SomeFunc(type_vvvvwcc)
 {
 	// set the function logic
-	if (type_vvvvwcc == 2)
+	if (type_vvvvwcc == 1)
 	{
 		return true;
 	}
@@ -271,33 +215,89 @@ function type_vvvvwcc_SomeFunc(type_vvvvwcc)
 }
 
 // the vvvvwcd function
-function vvvvwcd(target_vvvvwcd)
+function vvvvwcd(type_vvvvwcd)
+{
+	if (isSet(type_vvvvwcd) && type_vvvvwcd.constructor !== Array)
+	{
+		var temp_vvvvwcd = type_vvvvwcd;
+		var type_vvvvwcd = [];
+		type_vvvvwcd.push(temp_vvvvwcd);
+	}
+	else if (!isSet(type_vvvvwcd))
+	{
+		var type_vvvvwcd = [];
+	}
+	var type = type_vvvvwcd.some(type_vvvvwcd_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		// add required attribute to content field
+		if (jform_vvvvwcdwbg_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwcdwbg_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		// remove required attribute from content field
+		if (!jform_vvvvwcdwbg_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwcdwbg_required = true;
+		}
+	}
+}
+
+// the vvvvwcd Some function
+function type_vvvvwcd_SomeFunc(type_vvvvwcd)
 {
 	// set the function logic
-	if (target_vvvvwcd == 1)
+	if (type_vvvvwcd == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwce function
+function vvvvwce(target_vvvvwce)
+{
+	// set the function logic
+	if (target_vvvvwce == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwcdwbg_required)
+		if (jform_vvvvwcewbh_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwcdwbg_required = false;
+			jform_vvvvwcewbh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwcdwbg_required)
+		if (!jform_vvvvwcewbh_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwcdwbg_required = true;
+			jform_vvvvwcewbh_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js
index 975a7b8e6..182ca629e 100644
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvvzevza_required = false;
+jform_vvvvvzfvzb_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvze(add_php_view_vvvvvze);
+	var add_php_view_vvvvvzf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzf(add_php_view_vvvvvzf);
 });
 
-// the vvvvvze function
-function vvvvvze(add_php_view_vvvvvze)
+// the vvvvvzf function
+function vvvvvzf(add_php_view_vvvvvzf)
 {
 	// set the function logic
-	if (add_php_view_vvvvvze == 1)
+	if (add_php_view_vvvvvzf == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvzevza_required)
+		if (jform_vvvvvzfvzb_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzevza_required = false;
+			jform_vvvvvzfvzb_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvzevza_required)
+		if (!jform_vvvvvzfvzb_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzevza_required = true;
+			jform_vvvvvzfvzb_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js
index 7db2d61b9..6c3d5b0da 100644
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@@ -9,15 +9,12 @@
  */
 
 // Some Global Values
-jform_vvvvwalvzz_required = false;
-jform_vvvvwarwaa_required = false;
+jform_vvvvwamwaa_required = false;
+jform_vvvvwaswab_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwak = jQuery("#jform_how").val();
-	vvvvwak(how_vvvvwak);
-
 	var how_vvvvwal = jQuery("#jform_how").val();
 	vvvvwal(how_vvvvwal);
 
@@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwaq = jQuery("#jform_how").val();
 	vvvvwaq(how_vvvvwaq);
 
-	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwar(type_vvvvwar);
+	var how_vvvvwar = jQuery("#jform_how").val();
+	vvvvwar(how_vvvvwar);
+
+	var type_vvvvwas = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwas(type_vvvvwas);
 });
 
-// the vvvvwak function
-function vvvvwak(how_vvvvwak)
-{
-	if (isSet(how_vvvvwak) && how_vvvvwak.constructor !== Array)
-	{
-		var temp_vvvvwak = how_vvvvwak;
-		var how_vvvvwak = [];
-		how_vvvvwak.push(temp_vvvvwak);
-	}
-	else if (!isSet(how_vvvvwak))
-	{
-		var how_vvvvwak = [];
-	}
-	var how = how_vvvvwak.some(how_vvvvwak_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwak Some function
-function how_vvvvwak_SomeFunc(how_vvvvwak)
-{
-	// set the function logic
-	if (how_vvvvwak == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwal function
 function vvvvwal(how_vvvvwal)
 {
@@ -97,29 +59,11 @@ function vvvvwal(how_vvvvwal)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		// add required attribute to php_setdocument field
-		if (jform_vvvvwalvzz_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwalvzz_required = false;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwalvzz_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwalvzz_required = true;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -127,7 +71,7 @@ function vvvvwal(how_vvvvwal)
 function how_vvvvwal_SomeFunc(how_vvvvwal)
 {
 	// set the function logic
-	if (how_vvvvwal == 3)
+	if (how_vvvvwal == 2)
 	{
 		return true;
 	}
@@ -153,11 +97,29 @@ function vvvvwam(how_vvvvwam)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		// add required attribute to php_setdocument field
+		if (jform_vvvvwamwaa_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwamwaa_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		// remove required attribute from php_setdocument field
+		if (!jform_vvvvwamwaa_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwamwaa_required = true;
+		}
 	}
 }
 
@@ -165,7 +127,7 @@ function vvvvwam(how_vvvvwam)
 function how_vvvvwam_SomeFunc(how_vvvvwam)
 {
 	// set the function logic
-	if (how_vvvvwam == 2 || how_vvvvwam == 3)
+	if (how_vvvvwam == 3)
 	{
 		return true;
 	}
@@ -191,11 +153,11 @@ function vvvvwan(how_vvvvwan)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -203,7 +165,7 @@ function vvvvwan(how_vvvvwan)
 function how_vvvvwan_SomeFunc(how_vvvvwan)
 {
 	// set the function logic
-	if (how_vvvvwan == 1 || how_vvvvwan == 2 || how_vvvvwan == 3)
+	if (how_vvvvwan == 2 || how_vvvvwan == 3)
 	{
 		return true;
 	}
@@ -229,15 +191,11 @@ function vvvvwao(how_vvvvwao)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
 	}
 }
 
@@ -245,7 +203,7 @@ function vvvvwao(how_vvvvwao)
 function how_vvvvwao_SomeFunc(how_vvvvwao)
 {
 	// set the function logic
-	if (how_vvvvwao == 0)
+	if (how_vvvvwao == 1 || how_vvvvwao == 2 || how_vvvvwao == 3)
 	{
 		return true;
 	}
@@ -271,13 +229,15 @@ function vvvvwap(how_vvvvwap)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -285,7 +245,7 @@ function vvvvwap(how_vvvvwap)
 function how_vvvvwap_SomeFunc(how_vvvvwap)
 {
 	// set the function logic
-	if (how_vvvvwap == 1)
+	if (how_vvvvwap == 0)
 	{
 		return true;
 	}
@@ -308,6 +268,46 @@ function vvvvwaq(how_vvvvwaq)
 	var how = how_vvvvwaq.some(how_vvvvwaq_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwaq Some function
+function how_vvvvwaq_SomeFunc(how_vvvvwaq)
+{
+	// set the function logic
+	if (how_vvvvwaq == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwar function
+function vvvvwar(how_vvvvwar)
+{
+	if (isSet(how_vvvvwar) && how_vvvvwar.constructor !== Array)
+	{
+		var temp_vvvvwar = how_vvvvwar;
+		var how_vvvvwar = [];
+		how_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(how_vvvvwar))
+	{
+		var how_vvvvwar = [];
+	}
+	var how = how_vvvvwar.some(how_vvvvwar_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -323,45 +323,45 @@ function vvvvwaq(how_vvvvwaq)
 	}
 }
 
-// the vvvvwaq Some function
-function how_vvvvwaq_SomeFunc(how_vvvvwaq)
+// the vvvvwar Some function
+function how_vvvvwar_SomeFunc(how_vvvvwar)
 {
 	// set the function logic
-	if (how_vvvvwaq == 4)
+	if (how_vvvvwar == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwar function
-function vvvvwar(type_vvvvwar)
+// the vvvvwas function
+function vvvvwas(type_vvvvwas)
 {
 	// set the function logic
-	if (type_vvvvwar == 2)
+	if (type_vvvvwas == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
 		// add required attribute to libraries field
-		if (jform_vvvvwarwaa_required)
+		if (jform_vvvvwaswab_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwarwaa_required = false;
+			jform_vvvvwaswab_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
 		// remove required attribute from libraries field
-		if (!jform_vvvvwarwaa_required)
+		if (!jform_vvvvwaswab_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwarwaa_required = true;
+			jform_vvvvwaswab_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/server.js b/admin/models/forms/server.js
index 7472c9662..0a0f955ac 100644
--- a/admin/models/forms/server.js
+++ b/admin/models/forms/server.js
@@ -9,180 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvwbowar_required = false;
-jform_vvvvwbowas_required = false;
-jform_vvvvwbowat_required = false;
-jform_vvvvwbowau_required = false;
-jform_vvvvwbowav_required = false;
+jform_vvvvwbpwas_required = false;
+jform_vvvvwbpwat_required = false;
+jform_vvvvwbpwau_required = false;
+jform_vvvvwbpwav_required = false;
 jform_vvvvwbpwaw_required = false;
 jform_vvvvwbqwax_required = false;
-jform_vvvvwbsway_required = false;
-jform_vvvvwbuwaz_required = false;
+jform_vvvvwbrway_required = false;
+jform_vvvvwbtwaz_required = false;
+jform_vvvvwbvwba_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
-	vvvvwbo(protocol_vvvvwbo);
-
 	var protocol_vvvvwbp = jQuery("#jform_protocol").val();
 	vvvvwbp(protocol_vvvvwbp);
 
 	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
+	vvvvwbq(protocol_vvvvwbq);
 
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
 });
 
-// the vvvvwbo function
-function vvvvwbo(protocol_vvvvwbo)
-{
-	if (isSet(protocol_vvvvwbo) && protocol_vvvvwbo.constructor !== Array)
-	{
-		var temp_vvvvwbo = protocol_vvvvwbo;
-		var protocol_vvvvwbo = [];
-		protocol_vvvvwbo.push(temp_vvvvwbo);
-	}
-	else if (!isSet(protocol_vvvvwbo))
-	{
-		var protocol_vvvvwbo = [];
-	}
-	var protocol = protocol_vvvvwbo.some(protocol_vvvvwbo_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		// add required attribute to authentication field
-		if (jform_vvvvwbowar_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwbowar_required = false;
-		}
-		jQuery('#jform_host').closest('.control-group').show();
-		// add required attribute to host field
-		if (jform_vvvvwbowas_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwbowas_required = false;
-		}
-		jQuery('#jform_port').closest('.control-group').show();
-		// add required attribute to port field
-		if (jform_vvvvwbowat_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwbowat_required = false;
-		}
-		jQuery('#jform_path').closest('.control-group').show();
-		// add required attribute to path field
-		if (jform_vvvvwbowau_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwbowau_required = false;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		// add required attribute to username field
-		if (jform_vvvvwbowav_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwbowav_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		// remove required attribute from authentication field
-		if (!jform_vvvvwbowar_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwbowar_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		// remove required attribute from host field
-		if (!jform_vvvvwbowas_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwbowas_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		// remove required attribute from port field
-		if (!jform_vvvvwbowat_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwbowat_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		// remove required attribute from path field
-		if (!jform_vvvvwbowau_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwbowau_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		// remove required attribute from username field
-		if (!jform_vvvvwbowav_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwbowav_required = true;
-		}
-	}
-}
-
-// the vvvvwbo Some function
-function protocol_vvvvwbo_SomeFunc(protocol_vvvvwbo)
-{
-	// set the function logic
-	if (protocol_vvvvwbo == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbp function
 function vvvvwbp(protocol_vvvvwbp)
 {
@@ -202,29 +64,109 @@ function vvvvwbp(protocol_vvvvwbp)
 	// set this function logic
 	if (protocol)
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
-		// add required attribute to signature field
+		jQuery('#jform_authentication').closest('.control-group').show();
+		// add required attribute to authentication field
+		if (jform_vvvvwbpwas_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwbpwas_required = false;
+		}
+		jQuery('#jform_host').closest('.control-group').show();
+		// add required attribute to host field
+		if (jform_vvvvwbpwat_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwbpwat_required = false;
+		}
+		jQuery('#jform_port').closest('.control-group').show();
+		// add required attribute to port field
+		if (jform_vvvvwbpwau_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwbpwau_required = false;
+		}
+		jQuery('#jform_path').closest('.control-group').show();
+		// add required attribute to path field
+		if (jform_vvvvwbpwav_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwbpwav_required = false;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
+		// add required attribute to username field
 		if (jform_vvvvwbpwaw_required)
 		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
 			jform_vvvvwbpwaw_required = false;
 		}
 	}
 	else
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
-		// remove required attribute from signature field
+		jQuery('#jform_authentication').closest('.control-group').hide();
+		// remove required attribute from authentication field
+		if (!jform_vvvvwbpwas_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwbpwas_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		// remove required attribute from host field
+		if (!jform_vvvvwbpwat_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwbpwat_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		// remove required attribute from port field
+		if (!jform_vvvvwbpwau_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwbpwau_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		// remove required attribute from path field
+		if (!jform_vvvvwbpwav_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwbpwav_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
+		// remove required attribute from username field
 		if (!jform_vvvvwbpwaw_required)
 		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
 			jform_vvvvwbpwaw_required = true;
 		}
 	}
@@ -234,7 +176,7 @@ function vvvvwbp(protocol_vvvvwbp)
 function protocol_vvvvwbp_SomeFunc(protocol_vvvvwbp)
 {
 	// set the function logic
-	if (protocol_vvvvwbp == 1)
+	if (protocol_vvvvwbp == 2)
 	{
 		return true;
 	}
@@ -242,7 +184,7 @@ function protocol_vvvvwbp_SomeFunc(protocol_vvvvwbp)
 }
 
 // the vvvvwbq function
-function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
+function vvvvwbq(protocol_vvvvwbq)
 {
 	if (isSet(protocol_vvvvwbq) && protocol_vvvvwbq.constructor !== Array)
 	{
@@ -256,43 +198,33 @@ function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
 	}
 	var protocol = protocol_vvvvwbq.some(protocol_vvvvwbq_SomeFunc);
 
-	if (isSet(authentication_vvvvwbq) && authentication_vvvvwbq.constructor !== Array)
-	{
-		var temp_vvvvwbq = authentication_vvvvwbq;
-		var authentication_vvvvwbq = [];
-		authentication_vvvvwbq.push(temp_vvvvwbq);
-	}
-	else if (!isSet(authentication_vvvvwbq))
-	{
-		var authentication_vvvvwbq = [];
-	}
-	var authentication = authentication_vvvvwbq.some(authentication_vvvvwbq_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
-		// add required attribute to password field
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
+		// add required attribute to signature field
 		if (jform_vvvvwbqwax_required)
 		{
-			updateFieldRequired('password',0);
-			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
 			jform_vvvvwbqwax_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
-		// remove required attribute from password field
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
+		// remove required attribute from signature field
 		if (!jform_vvvvwbqwax_required)
 		{
-			updateFieldRequired('password',1);
-			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
 			jform_vvvvwbqwax_required = true;
 		}
 	}
@@ -302,50 +234,118 @@ function vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq)
 function protocol_vvvvwbq_SomeFunc(protocol_vvvvwbq)
 {
 	// set the function logic
-	if (protocol_vvvvwbq == 2)
+	if (protocol_vvvvwbq == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbq Some function
-function authentication_vvvvwbq_SomeFunc(authentication_vvvvwbq)
+// the vvvvwbr function
+function vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr)
+{
+	if (isSet(protocol_vvvvwbr) && protocol_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = protocol_vvvvwbr;
+		var protocol_vvvvwbr = [];
+		protocol_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(protocol_vvvvwbr))
+	{
+		var protocol_vvvvwbr = [];
+	}
+	var protocol = protocol_vvvvwbr.some(protocol_vvvvwbr_SomeFunc);
+
+	if (isSet(authentication_vvvvwbr) && authentication_vvvvwbr.constructor !== Array)
+	{
+		var temp_vvvvwbr = authentication_vvvvwbr;
+		var authentication_vvvvwbr = [];
+		authentication_vvvvwbr.push(temp_vvvvwbr);
+	}
+	else if (!isSet(authentication_vvvvwbr))
+	{
+		var authentication_vvvvwbr = [];
+	}
+	var authentication = authentication_vvvvwbr.some(authentication_vvvvwbr_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		// add required attribute to password field
+		if (jform_vvvvwbrway_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwbrway_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		// remove required attribute from password field
+		if (!jform_vvvvwbrway_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwbrway_required = true;
+		}
+	}
+}
+
+// the vvvvwbr Some function
+function protocol_vvvvwbr_SomeFunc(protocol_vvvvwbr)
 {
 	// set the function logic
-	if (authentication_vvvvwbq == 1 || authentication_vvvvwbq == 3 || authentication_vvvvwbq == 5)
+	if (protocol_vvvvwbr == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbs function
-function vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs)
+// the vvvvwbr Some function
+function authentication_vvvvwbr_SomeFunc(authentication_vvvvwbr)
 {
-	if (isSet(protocol_vvvvwbs) && protocol_vvvvwbs.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwbr == 1 || authentication_vvvvwbr == 3 || authentication_vvvvwbr == 5)
 	{
-		var temp_vvvvwbs = protocol_vvvvwbs;
-		var protocol_vvvvwbs = [];
-		protocol_vvvvwbs.push(temp_vvvvwbs);
+		return true;
 	}
-	else if (!isSet(protocol_vvvvwbs))
-	{
-		var protocol_vvvvwbs = [];
-	}
-	var protocol = protocol_vvvvwbs.some(protocol_vvvvwbs_SomeFunc);
+	return false;
+}
 
-	if (isSet(authentication_vvvvwbs) && authentication_vvvvwbs.constructor !== Array)
+// the vvvvwbt function
+function vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt)
+{
+	if (isSet(protocol_vvvvwbt) && protocol_vvvvwbt.constructor !== Array)
 	{
-		var temp_vvvvwbs = authentication_vvvvwbs;
-		var authentication_vvvvwbs = [];
-		authentication_vvvvwbs.push(temp_vvvvwbs);
+		var temp_vvvvwbt = protocol_vvvvwbt;
+		var protocol_vvvvwbt = [];
+		protocol_vvvvwbt.push(temp_vvvvwbt);
 	}
-	else if (!isSet(authentication_vvvvwbs))
+	else if (!isSet(protocol_vvvvwbt))
 	{
-		var authentication_vvvvwbs = [];
+		var protocol_vvvvwbt = [];
 	}
-	var authentication = authentication_vvvvwbs.some(authentication_vvvvwbs_SomeFunc);
+	var protocol = protocol_vvvvwbt.some(protocol_vvvvwbt_SomeFunc);
+
+	if (isSet(authentication_vvvvwbt) && authentication_vvvvwbt.constructor !== Array)
+	{
+		var temp_vvvvwbt = authentication_vvvvwbt;
+		var authentication_vvvvwbt = [];
+		authentication_vvvvwbt.push(temp_vvvvwbt);
+	}
+	else if (!isSet(authentication_vvvvwbt))
+	{
+		var authentication_vvvvwbt = [];
+	}
+	var authentication = authentication_vvvvwbt.some(authentication_vvvvwbt_SomeFunc);
 
 
 	// set this function logic
@@ -353,78 +353,78 @@ function vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvwbsway_required)
+		if (jform_vvvvwbtwaz_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwbsway_required = false;
+			jform_vvvvwbtwaz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvwbsway_required)
+		if (!jform_vvvvwbtwaz_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwbsway_required = true;
+			jform_vvvvwbtwaz_required = true;
 		}
 	}
 }
 
-// the vvvvwbs Some function
-function protocol_vvvvwbs_SomeFunc(protocol_vvvvwbs)
+// the vvvvwbt Some function
+function protocol_vvvvwbt_SomeFunc(protocol_vvvvwbt)
 {
 	// set the function logic
-	if (protocol_vvvvwbs == 2)
+	if (protocol_vvvvwbt == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbs Some function
-function authentication_vvvvwbs_SomeFunc(authentication_vvvvwbs)
+// the vvvvwbt Some function
+function authentication_vvvvwbt_SomeFunc(authentication_vvvvwbt)
 {
 	// set the function logic
-	if (authentication_vvvvwbs == 2 || authentication_vvvvwbs == 3)
+	if (authentication_vvvvwbt == 2 || authentication_vvvvwbt == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbu function
-function vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu)
+// the vvvvwbv function
+function vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv)
 {
-	if (isSet(protocol_vvvvwbu) && protocol_vvvvwbu.constructor !== Array)
+	if (isSet(protocol_vvvvwbv) && protocol_vvvvwbv.constructor !== Array)
 	{
-		var temp_vvvvwbu = protocol_vvvvwbu;
-		var protocol_vvvvwbu = [];
-		protocol_vvvvwbu.push(temp_vvvvwbu);
+		var temp_vvvvwbv = protocol_vvvvwbv;
+		var protocol_vvvvwbv = [];
+		protocol_vvvvwbv.push(temp_vvvvwbv);
 	}
-	else if (!isSet(protocol_vvvvwbu))
+	else if (!isSet(protocol_vvvvwbv))
 	{
-		var protocol_vvvvwbu = [];
+		var protocol_vvvvwbv = [];
 	}
-	var protocol = protocol_vvvvwbu.some(protocol_vvvvwbu_SomeFunc);
+	var protocol = protocol_vvvvwbv.some(protocol_vvvvwbv_SomeFunc);
 
-	if (isSet(authentication_vvvvwbu) && authentication_vvvvwbu.constructor !== Array)
+	if (isSet(authentication_vvvvwbv) && authentication_vvvvwbv.constructor !== Array)
 	{
-		var temp_vvvvwbu = authentication_vvvvwbu;
-		var authentication_vvvvwbu = [];
-		authentication_vvvvwbu.push(temp_vvvvwbu);
+		var temp_vvvvwbv = authentication_vvvvwbv;
+		var authentication_vvvvwbv = [];
+		authentication_vvvvwbv.push(temp_vvvvwbv);
 	}
-	else if (!isSet(authentication_vvvvwbu))
+	else if (!isSet(authentication_vvvvwbv))
 	{
-		var authentication_vvvvwbu = [];
+		var authentication_vvvvwbv = [];
 	}
-	var authentication = authentication_vvvvwbu.some(authentication_vvvvwbu_SomeFunc);
+	var authentication = authentication_vvvvwbv.some(authentication_vvvvwbv_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwbuwaz_required)
+		if (jform_vvvvwbvwba_required)
 		{
 			updateFieldRequired('private_key',0);
 			jQuery('#jform_private_key').prop('required','required');
 			jQuery('#jform_private_key').attr('aria-required',true);
 			jQuery('#jform_private_key').addClass('required');
-			jform_vvvvwbuwaz_required = false;
+			jform_vvvvwbvwba_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwbuwaz_required)
+		if (!jform_vvvvwbvwba_required)
 		{
 			updateFieldRequired('private_key',1);
 			jQuery('#jform_private_key').removeAttr('required');
 			jQuery('#jform_private_key').removeAttr('aria-required');
 			jQuery('#jform_private_key').removeClass('required');
-			jform_vvvvwbuwaz_required = true;
+			jform_vvvvwbvwba_required = true;
 		}
 	}
 }
 
-// the vvvvwbu Some function
-function protocol_vvvvwbu_SomeFunc(protocol_vvvvwbu)
+// the vvvvwbv Some function
+function protocol_vvvvwbv_SomeFunc(protocol_vvvvwbv)
 {
 	// set the function logic
-	if (protocol_vvvvwbu == 2)
+	if (protocol_vvvvwbv == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbu Some function
-function authentication_vvvvwbu_SomeFunc(authentication_vvvvwbu)
+// the vvvvwbv Some function
+function authentication_vvvvwbv_SomeFunc(authentication_vvvvwbv)
 {
 	// set the function logic
-	if (authentication_vvvvwbu == 4 || authentication_vvvvwbu == 5)
+	if (authentication_vvvvwbv == 4 || authentication_vvvvwbv == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbw function
-function vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw)
+// the vvvvwbx function
+function vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx)
 {
-	if (isSet(protocol_vvvvwbw) && protocol_vvvvwbw.constructor !== Array)
+	if (isSet(protocol_vvvvwbx) && protocol_vvvvwbx.constructor !== Array)
 	{
-		var temp_vvvvwbw = protocol_vvvvwbw;
-		var protocol_vvvvwbw = [];
-		protocol_vvvvwbw.push(temp_vvvvwbw);
+		var temp_vvvvwbx = protocol_vvvvwbx;
+		var protocol_vvvvwbx = [];
+		protocol_vvvvwbx.push(temp_vvvvwbx);
 	}
-	else if (!isSet(protocol_vvvvwbw))
+	else if (!isSet(protocol_vvvvwbx))
 	{
-		var protocol_vvvvwbw = [];
+		var protocol_vvvvwbx = [];
 	}
-	var protocol = protocol_vvvvwbw.some(protocol_vvvvwbw_SomeFunc);
+	var protocol = protocol_vvvvwbx.some(protocol_vvvvwbx_SomeFunc);
 
-	if (isSet(authentication_vvvvwbw) && authentication_vvvvwbw.constructor !== Array)
+	if (isSet(authentication_vvvvwbx) && authentication_vvvvwbx.constructor !== Array)
 	{
-		var temp_vvvvwbw = authentication_vvvvwbw;
-		var authentication_vvvvwbw = [];
-		authentication_vvvvwbw.push(temp_vvvvwbw);
+		var temp_vvvvwbx = authentication_vvvvwbx;
+		var authentication_vvvvwbx = [];
+		authentication_vvvvwbx.push(temp_vvvvwbx);
 	}
-	else if (!isSet(authentication_vvvvwbw))
+	else if (!isSet(authentication_vvvvwbx))
 	{
-		var authentication_vvvvwbw = [];
+		var authentication_vvvvwbx = [];
 	}
-	var authentication = authentication_vvvvwbw.some(authentication_vvvvwbw_SomeFunc);
+	var authentication = authentication_vvvvwbx.some(authentication_vvvvwbx_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw)
 	}
 }
 
-// the vvvvwbw Some function
-function protocol_vvvvwbw_SomeFunc(protocol_vvvvwbw)
+// the vvvvwbx Some function
+function protocol_vvvvwbx_SomeFunc(protocol_vvvvwbx)
 {
 	// set the function logic
-	if (protocol_vvvvwbw == 2)
+	if (protocol_vvvvwbx == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbw Some function
-function authentication_vvvvwbw_SomeFunc(authentication_vvvvwbw)
+// the vvvvwbx Some function
+function authentication_vvvvwbx_SomeFunc(authentication_vvvvwbx)
 {
 	// set the function logic
-	if (authentication_vvvvwbw == 2 || authentication_vvvvwbw == 3 || authentication_vvvvwbw == 4 || authentication_vvvvwbw == 5)
+	if (authentication_vvvvwbx == 2 || authentication_vvvvwbx == 3 || authentication_vvvvwbx == 4 || authentication_vvvvwbx == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js
index f175430d6..815d76d84 100644
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvysvyo_required = false;
 jform_vvvvvytvyp_required = false;
 jform_vvvvvyuvyq_required = false;
 jform_vvvvvyvvyr_required = false;
@@ -19,317 +18,318 @@ jform_vvvvvyyvyu_required = false;
 jform_vvvvvyzvyv_required = false;
 jform_vvvvvzavyw_required = false;
 jform_vvvvvzbvyx_required = false;
-jform_vvvvvzbvyy_required = false;
+jform_vvvvvzcvyy_required = false;
+jform_vvvvvzcvyz_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyt(add_php_view_vvvvvyt);
 
-	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_display_vvvvvyt);
+	var add_php_jview_display_vvvvvyu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyu(add_php_jview_display_vvvvvyu);
 
-	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyu(add_php_jview_vvvvvyu);
+	var add_php_jview_vvvvvyv = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyv(add_php_jview_vvvvvyv);
 
-	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyv(add_php_document_vvvvvyv);
+	var add_php_document_vvvvvyw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyw(add_php_document_vvvvvyw);
 
-	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyw(add_css_document_vvvvvyw);
+	var add_css_document_vvvvvyx = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyx(add_css_document_vvvvvyx);
 
-	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyx(add_javascript_file_vvvvvyx);
+	var add_javascript_file_vvvvvyy = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyy(add_javascript_file_vvvvvyy);
 
-	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyy(add_js_document_vvvvvyy);
+	var add_js_document_vvvvvyz = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyz(add_js_document_vvvvvyz);
 
-	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyz(add_css_vvvvvyz);
+	var add_css_vvvvvza = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvza(add_css_vvvvvza);
 
-	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvza(add_php_ajax_vvvvvza);
+	var add_php_ajax_vvvvvzb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvzb(add_php_ajax_vvvvvzb);
 
-	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzb(add_custom_button_vvvvvzb);
+	var add_custom_button_vvvvvzc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzc(add_custom_button_vvvvvzc);
 
-	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
-	vvvvvzc(button_position_vvvvvzc);
+	var button_position_vvvvvzd = jQuery("#jform_button_position").val();
+	vvvvvzd(button_position_vvvvvzd);
 });
 
-// the vvvvvys function
-function vvvvvys(add_php_view_vvvvvys)
+// the vvvvvyt function
+function vvvvvyt(add_php_view_vvvvvyt)
 {
 	// set the function logic
-	if (add_php_view_vvvvvys == 1)
+	if (add_php_view_vvvvvyt == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvytvyp_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvysvyo_required = false;
+			jform_vvvvvytvyp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvytvyp_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvysvyo_required = true;
-		}
-	}
-}
-
-// the vvvvvyt function
-function vvvvvyt(add_php_jview_display_vvvvvyt)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyt == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		// add required attribute to php_jview_display field
-		if (jform_vvvvvytvyp_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvytvyp_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview_display field
-		if (!jform_vvvvvytvyp_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvytvyp_required = true;
 		}
 	}
 }
 
 // the vvvvvyu function
-function vvvvvyu(add_php_jview_vvvvvyu)
+function vvvvvyu(add_php_jview_display_vvvvvyu)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyu == 1)
+	if (add_php_jview_display_vvvvvyu == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
-		// add required attribute to php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
+		// add required attribute to php_jview_display field
 		if (jform_vvvvvyuvyq_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyuvyq_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
-		// remove required attribute from php_jview field
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview_display field
 		if (!jform_vvvvvyuvyq_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyuvyq_required = true;
 		}
 	}
 }
 
 // the vvvvvyv function
-function vvvvvyv(add_php_document_vvvvvyv)
+function vvvvvyv(add_php_jview_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyv == 1)
+	if (add_php_jview_vvvvvyv == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
-		// add required attribute to php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		// add required attribute to php_jview field
 		if (jform_vvvvvyvvyr_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvyvvyr_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
-		// remove required attribute from php_document field
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		// remove required attribute from php_jview field
 		if (!jform_vvvvvyvvyr_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvyvvyr_required = true;
 		}
 	}
 }
 
 // the vvvvvyw function
-function vvvvvyw(add_css_document_vvvvvyw)
+function vvvvvyw(add_php_document_vvvvvyw)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyw == 1)
+	if (add_php_document_vvvvvyw == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
-		// add required attribute to css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		// add required attribute to php_document field
 		if (jform_vvvvvywvys_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvywvys_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
-		// remove required attribute from css_document field
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		// remove required attribute from php_document field
 		if (!jform_vvvvvywvys_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvywvys_required = true;
 		}
 	}
 }
 
 // the vvvvvyx function
-function vvvvvyx(add_javascript_file_vvvvvyx)
+function vvvvvyx(add_css_document_vvvvvyx)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyx == 1)
+	if (add_css_document_vvvvvyx == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
-		// add required attribute to javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		// add required attribute to css_document field
 		if (jform_vvvvvyxvyt_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvyxvyt_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
-		// remove required attribute from javascript_file field
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		// remove required attribute from css_document field
 		if (!jform_vvvvvyxvyt_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvyxvyt_required = true;
 		}
 	}
 }
 
 // the vvvvvyy function
-function vvvvvyy(add_js_document_vvvvvyy)
+function vvvvvyy(add_javascript_file_vvvvvyy)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyy == 1)
+	if (add_javascript_file_vvvvvyy == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
-		// add required attribute to js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		// add required attribute to javascript_file field
 		if (jform_vvvvvyyvyu_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyyvyu_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
-		// remove required attribute from js_document field
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		// remove required attribute from javascript_file field
 		if (!jform_vvvvvyyvyu_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyyvyu_required = true;
 		}
 	}
 }
 
 // the vvvvvyz function
-function vvvvvyz(add_css_vvvvvyz)
+function vvvvvyz(add_js_document_vvvvvyz)
 {
 	// set the function logic
-	if (add_css_vvvvvyz == 1)
+	if (add_js_document_vvvvvyz == 1)
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		// add required attribute to css field
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		// add required attribute to js_document field
 		if (jform_vvvvvyzvyv_required)
 		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
 			jform_vvvvvyzvyv_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		// remove required attribute from css field
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		// remove required attribute from js_document field
 		if (!jform_vvvvvyzvyv_required)
 		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvyzvyv_required = true;
 		}
 	}
 }
 
 // the vvvvvza function
-function vvvvvza(add_php_ajax_vvvvvza)
+function vvvvvza(add_css_vvvvvza)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvza == 1)
+	if (add_css_vvvvvza == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		// add required attribute to css field
+		if (jform_vvvvvzavyw_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvzavyw_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		// remove required attribute from css field
+		if (!jform_vvvvvzavyw_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvzavyw_required = true;
+		}
+	}
+}
+
+// the vvvvvzb function
+function vvvvvzb(add_php_ajax_vvvvvzb)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvzb == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
 		// add required attribute to php_ajaxmethod field
-		if (jform_vvvvvzavyw_required)
+		if (jform_vvvvvzbvyx_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvzavyw_required = false;
+			jform_vvvvvzbvyx_required = false;
 		}
 	}
 	else
@@ -337,43 +337,43 @@ function vvvvvza(add_php_ajax_vvvvvza)
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
 		// remove required attribute from php_ajaxmethod field
-		if (!jform_vvvvvzavyw_required)
+		if (!jform_vvvvvzbvyx_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvzavyw_required = true;
+			jform_vvvvvzbvyx_required = true;
 		}
 	}
 }
 
-// the vvvvvzb function
-function vvvvvzb(add_custom_button_vvvvvzb)
+// the vvvvvzc function
+function vvvvvzc(add_custom_button_vvvvvzc)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvzb == 1)
+	if (add_custom_button_vvvvvzc == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
 		// add required attribute to php_controller field
-		if (jform_vvvvvzbvyx_required)
+		if (jform_vvvvvzcvyy_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvzbvyx_required = false;
+			jform_vvvvvzcvyy_required = false;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
 		// add required attribute to php_model field
-		if (jform_vvvvvzbvyy_required)
+		if (jform_vvvvvzcvyz_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvzbvyy_required = false;
+			jform_vvvvvzcvyz_required = false;
 		}
 	}
 	else
@@ -381,41 +381,41 @@ function vvvvvzb(add_custom_button_vvvvvzb)
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
 		// remove required attribute from php_controller field
-		if (!jform_vvvvvzbvyx_required)
+		if (!jform_vvvvvzcvyy_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvzbvyx_required = true;
+			jform_vvvvvzcvyy_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
 		// remove required attribute from php_model field
-		if (!jform_vvvvvzbvyy_required)
+		if (!jform_vvvvvzcvyz_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvzbvyy_required = true;
+			jform_vvvvvzcvyz_required = true;
 		}
 	}
 }
 
-// the vvvvvzc function
-function vvvvvzc(button_position_vvvvvzc)
+// the vvvvvzd function
+function vvvvvzd(button_position_vvvvvzd)
 {
-	if (isSet(button_position_vvvvvzc) && button_position_vvvvvzc.constructor !== Array)
+	if (isSet(button_position_vvvvvzd) && button_position_vvvvvzd.constructor !== Array)
 	{
-		var temp_vvvvvzc = button_position_vvvvvzc;
-		var button_position_vvvvvzc = [];
-		button_position_vvvvvzc.push(temp_vvvvvzc);
+		var temp_vvvvvzd = button_position_vvvvvzd;
+		var button_position_vvvvvzd = [];
+		button_position_vvvvvzd.push(temp_vvvvvzd);
 	}
-	else if (!isSet(button_position_vvvvvzc))
+	else if (!isSet(button_position_vvvvvzd))
 	{
-		var button_position_vvvvvzc = [];
+		var button_position_vvvvvzd = [];
 	}
-	var button_position = button_position_vvvvvzc.some(button_position_vvvvvzc_SomeFunc);
+	var button_position = button_position_vvvvvzd.some(button_position_vvvvvzd_SomeFunc);
 
 
 	// set this function logic
@@ -429,11 +429,11 @@ function vvvvvzc(button_position_vvvvvzc)
 	}
 }
 
-// the vvvvvzc Some function
-function button_position_vvvvvzc_SomeFunc(button_position_vvvvvzc)
+// the vvvvvzd Some function
+function button_position_vvvvvzd_SomeFunc(button_position_vvvvvzd)
 {
 	// set the function logic
-	if (button_position_vvvvvzc == 5)
+	if (button_position_vvvvvzd == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js
index b4aaf727b..efbc1d633 100644
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvvzdvyz_required = false;
+jform_vvvvvzevza_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvze(add_php_view_vvvvvze);
 });
 
-// the vvvvvzd function
-function vvvvvzd(add_php_view_vvvvvzd)
+// the vvvvvze function
+function vvvvvze(add_php_view_vvvvvze)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzd == 1)
+	if (add_php_view_vvvvvze == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
 		// add required attribute to php_view field
-		if (jform_vvvvvzdvyz_required)
+		if (jform_vvvvvzevza_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzdvyz_required = false;
+			jform_vvvvvzevza_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		// remove required attribute from php_view field
-		if (!jform_vvvvvzdvyz_required)
+		if (!jform_vvvvvzevza_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzdvyz_required = true;
+			jform_vvvvvzevza_required = true;
 		}
 	}
 }
diff --git a/admin/models/server.php b/admin/models/server.php
index 6d6ef0605..1bc18a6e9 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -156,7 +156,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWbalinked_components()
+	public function getWbblinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 6365442c1..f51a2b074 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -153,6 +153,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_javascript_views_file` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_after_cancel` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_after_delete` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_after_publish` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
@@ -198,6 +199,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`mysql_table_row_format` VARCHAR(64) NOT NULL DEFAULT 0,
 	`name_list` CHAR(64) NOT NULL DEFAULT '',
 	`name_single` CHAR(64) NOT NULL DEFAULT '',
+	`php_after_cancel` MEDIUMTEXT NOT NULL,
 	`php_after_delete` MEDIUMTEXT NOT NULL,
 	`php_after_publish` MEDIUMTEXT NOT NULL,
 	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
@@ -255,25 +257,25 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_add_php_allowadd` (`add_php_allowadd`),
 	KEY `idx_add_php_save` (`add_php_save`),
 	KEY `idx_add_php_getform` (`add_php_getform`),
-	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
+	KEY `idx_name_list` (`name_list`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
 	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
-	KEY `idx_add_sql` (`add_sql`),
-	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_mysql_table_engine` (`mysql_table_engine`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_mysql_table_collate` (`mysql_table_collate`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_document` (`add_php_document`),
 	KEY `idx_type` (`type`),
 	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
 	KEY `idx_add_php_before_save` (`add_php_before_save`),
 	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
 	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
-	KEY `idx_add_php_document` (`add_php_document`),
-	KEY `idx_mysql_table_collate` (`mysql_table_collate`),
-	KEY `idx_add_custom_import` (`add_custom_import`),
-	KEY `idx_name_list` (`name_list`),
+	KEY `idx_add_php_after_cancel` (`add_php_after_cancel`),
+	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
+	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
+	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
+	KEY `idx_mysql_table_engine` (`mysql_table_engine`),
+	KEY `idx_add_sql` (`add_sql`),
 	KEY `idx_add_css_view` (`add_css_view`),
 	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
@@ -283,10 +285,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_mysql_table_charset` (`mysql_table_charset`),
 	KEY `idx_mysql_table_row_format` (`mysql_table_row_format`),
-	KEY `idx_source` (`source`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
+	KEY `idx_source` (`source`),
 	KEY `idx_add_php_getitem` (`add_php_getitem`),
-	KEY `idx_add_php_getitems` (`add_php_getitems`)
+	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC;
 
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
diff --git a/admin/sql/updates/mysql/2.9.18.sql b/admin/sql/updates/mysql/2.9.18.sql
index 8e8c67c18..d3fdeaec3 100644
--- a/admin/sql/updates/mysql/2.9.18.sql
+++ b/admin/sql/updates/mysql/2.9.18.sql
@@ -1,3 +1,3 @@
-ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_before_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_batchmove`;
-
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_before_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_batchmove`;
+
 ALTER TABLE `#__componentbuilder_admin_view` ADD `php_before_cancel` MEDIUMTEXT NOT NULL AFTER `php_batchmove`;
diff --git a/admin/sql/updates/mysql/2.9.19.sql b/admin/sql/updates/mysql/2.9.19.sql
new file mode 100644
index 000000000..3fd839cc2
--- /dev/null
+++ b/admin/sql/updates/mysql/2.9.19.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_after_cancel` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_javascript_views_footer`;
+
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_after_cancel` MEDIUMTEXT NOT NULL AFTER `name_single`;
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index a7e598a70..16f4ebaea 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -478,206 +478,206 @@ jQuery('#adminForm').on('change', '#jform_add_php_before_cancel',function (e)
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxt function
+// #jform_add_php_after_cancel listeners for add_php_after_cancel_vvvvvxt function
+jQuery('#jform_add_php_after_cancel').on('keyup',function()
+{
+	var add_php_after_cancel_vvvvvxt = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	vvvvvxt(add_php_after_cancel_vvvvvxt);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_cancel',function (e)
+{
+	e.preventDefault();
+	var add_php_after_cancel_vvvvvxt = jQuery("#jform_add_php_after_cancel input[type='radio']:checked").val();
+	vvvvvxt(add_php_after_cancel_vvvvvxt);
+
+});
+
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxu function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchcopy_vvvvvxt);
+	var add_php_batchcopy_vvvvvxu = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxu(add_php_batchcopy_vvvvvxu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxt = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxt(add_php_batchcopy_vvvvvxt);
+	var add_php_batchcopy_vvvvvxu = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxu(add_php_batchcopy_vvvvvxu);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxu function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxv function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxu(add_php_batchmove_vvvvvxu);
+	var add_php_batchmove_vvvvvxv = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxv(add_php_batchmove_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxu = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxu(add_php_batchmove_vvvvvxu);
+	var add_php_batchmove_vvvvvxv = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxv(add_php_batchmove_vvvvvxv);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxv function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxw function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_before_publish_vvvvvxv);
+	var add_php_before_publish_vvvvvxw = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxw(add_php_before_publish_vvvvvxw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxv = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxv(add_php_before_publish_vvvvvxv);
+	var add_php_before_publish_vvvvvxw = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxw(add_php_before_publish_vvvvvxw);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxw function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxx function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxw(add_php_after_publish_vvvvvxw);
+	var add_php_after_publish_vvvvvxx = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxx(add_php_after_publish_vvvvvxx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxw = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxw(add_php_after_publish_vvvvvxw);
+	var add_php_after_publish_vvvvvxx = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxx(add_php_after_publish_vvvvvxx);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxx function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxy function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_before_delete_vvvvvxx);
+	var add_php_before_delete_vvvvvxy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxy(add_php_before_delete_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxx = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxx(add_php_before_delete_vvvvvxx);
+	var add_php_before_delete_vvvvvxy = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxy(add_php_before_delete_vvvvvxy);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxy function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxz function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxy(add_php_after_delete_vvvvvxy);
+	var add_php_after_delete_vvvvvxz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxz(add_php_after_delete_vvvvvxz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxy = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxy(add_php_after_delete_vvvvvxy);
+	var add_php_after_delete_vvvvvxz = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxz(add_php_after_delete_vvvvvxz);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvxz function
+// #jform_add_php_document listeners for add_php_document_vvvvvya function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxz(add_php_document_vvvvvxz);
+	var add_php_document_vvvvvya = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvya(add_php_document_vvvvvya);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxz = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxz(add_php_document_vvvvvxz);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvya function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(add_sql_vvvvvya);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(add_sql_vvvvvya);
-
-});
-
-// #jform_source listeners for source_vvvvvyb function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	var add_php_document_vvvvvya = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvya(add_php_document_vvvvvya);
 
 });
 
 // #jform_add_sql listeners for add_sql_vvvvvyb function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	vvvvvyb(add_sql_vvvvvyb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+	vvvvvyb(add_sql_vvvvvyb);
 
 });
 
-// #jform_source listeners for source_vvvvvyd function
+// #jform_source listeners for source_vvvvvyc function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvyd function
+// #jform_add_sql listeners for add_sql_vvvvvyc function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvyd = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvyd = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvyd(source_vvvvvyd,add_sql_vvvvvyd);
+	var source_vvvvvyc = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyc = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyc(source_vvvvvyc,add_sql_vvvvvyc);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvyf function
-jQuery('#jform_add_custom_import').on('keyup',function()
+// #jform_source listeners for source_vvvvvye function
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyf(add_custom_import_vvvvvyf);
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvyf = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyf(add_custom_import_vvvvvyf);
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvye function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvye = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvye = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvye(source_vvvvvye,add_sql_vvvvvye);
 
 });
 
@@ -696,18 +696,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyh function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvyh function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvyh = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyh(add_custom_import_vvvvvyh);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvyh = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvyh(add_custom_import_vvvvvyh);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyi function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);
 
 });
 
diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php
index 7e2f0163a..9305b34f5 100644
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@@ -221,36 +221,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 			}
 		}
 
-		// Set Type Selection
-		$this->typeOptions = $this->getTheTypeSelections();
-		// We do some sanitation for Type filter
-		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
-			isset($this->typeOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
-		{
-			unset($this->typeOptions[0]);
-		}
-		// Only load Type filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->typeOptions))
-		{
-			// Type Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
-				'filter_type',
-				JHtml::_('select.options', $this->typeOptions, 'value', 'text', $this->state->get('filter.type'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Type Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
-					'batch[type]',
-					JHtml::_('select.options', $this->typeOptions, 'value', 'text')
-				);
-			}
-		}
-
 		// Set Add Custom Import Selection
 		$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
 		// We do some sanitation for Add Custom Import filter
@@ -281,6 +251,36 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 			}
 		}
 
+		// Set Type Selection
+		$this->typeOptions = $this->getTheTypeSelections();
+		// We do some sanitation for Type filter
+		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
+			isset($this->typeOptions[0]->value) &&
+			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
+		{
+			unset($this->typeOptions[0]);
+		}
+		// Only load Type filter if it has values
+		if (ComponentbuilderHelper::checkArray($this->typeOptions))
+		{
+			// Type Filter
+			JHtmlSidebar::addFilter(
+				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
+				'filter_type',
+				JHtml::_('select.options', $this->typeOptions, 'value', 'text', $this->state->get('filter.type'))
+			);
+
+			if ($this->canBatch && $this->canCreate && $this->canEdit)
+			{
+				// Type Batch Selection
+				JHtmlBatch_::addListSelection(
+					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
+					'batch[type]',
+					JHtml::_('select.options', $this->typeOptions, 'value', 'text')
+				);
+			}
+		}
+
 		// Set Add Custom Button Selection
 		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
 		// We do some sanitation for Add Custom Button filter
@@ -428,42 +428,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		return false;
 	}
 
-	protected function getTheTypeSelections()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-
-		// Create a new query object.
-		$query = $db->getQuery(true);
-
-		// Select the text.
-		$query->select($db->quoteName('type'));
-		$query->from($db->quoteName('#__componentbuilder_admin_view'));
-		$query->order($db->quoteName('type') . ' ASC');
-
-		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-
-		$results = $db->loadColumn();
-
-		if ($results)
-		{
-			// get model
-			$model = $this->getModel();
-			$results = array_unique($results);
-			$_filter = array();
-			foreach ($results as $type)
-			{
-				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
-				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
-			}
-			return $_filter;
-		}
-		return false;
-	}
-
 	protected function getTheAdd_custom_importSelections()
 	{
 		// Get a db connection.
@@ -500,6 +464,42 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		return false;
 	}
 
+	protected function getTheTypeSelections()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('type'));
+		$query->from($db->quoteName('#__componentbuilder_admin_view'));
+		$query->order($db->quoteName('type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+
+		if ($results)
+		{
+			// get model
+			$model = $this->getModel();
+			$results = array_unique($results);
+			$_filter = array();
+			foreach ($results as $type)
+			{
+				// Translate the type selection
+				$text = $model->selectionTranslation($type,'type');
+				// Now add the type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+			}
+			return $_filter;
+		}
+		return false;
+	}
+
 	protected function getTheAdd_custom_buttonSelections()
 	{
 		// Get a db connection.
diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php
index b0d6a8416..bfb648fda 100644
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@@ -163,153 +163,153 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyi function
+// #jform_add_php_view listeners for add_php_view_vvvvvyj function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyj function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyk function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyk function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyl function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyl function
+// #jform_add_php_document listeners for add_php_document_vvvvvym function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvym function
+// #jform_add_css_document listeners for add_css_document_vvvvvyn function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyn function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyo function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_javascript_file_vvvvvyn);
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyn = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_javascript_file_vvvvvyn);
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyo function
+// #jform_add_js_document listeners for add_js_document_vvvvvyp function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_js_document_vvvvvyo);
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyo = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_js_document_vvvvvyo);
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyp function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyq function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyp(add_custom_button_vvvvvyp);
+	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyq(add_custom_button_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyp = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyp(add_custom_button_vvvvvyp);
+	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyq(add_custom_button_vvvvvyq);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyq function
+// #jform_add_css listeners for add_css_vvvvvyr function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	var add_css_vvvvvyr = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyr(add_css_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	var add_css_vvvvvyr = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyr(add_css_vvvvvyr);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyr function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvys function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	var add_php_ajax_vvvvvys = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvys(add_php_ajax_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	var add_php_ajax_vvvvvys = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvys(add_php_ajax_vvvvvys);
 
 });
 
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index 70e1f0dc8..1a9d78088 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvwag function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwag(target_vvvvwag);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwag = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwag(target_vvvvwag);
-
-});
-
 // #jform_target listeners for target_vvvvwah function
 jQuery('#jform_target').on('keyup',function()
 {
@@ -150,67 +135,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
+	vvvvwai(target_vvvvwai);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
-
-});
-
-// #jform_type listeners for type_vvvvwai function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwai = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwai(target_vvvvwai,type_vvvvwai);
-
-});
-
-// #jform_type listeners for type_vvvvwaj function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	vvvvwai(target_vvvvwai);
 
 });
 
 // #jform_target listeners for target_vvvvwaj function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaj(type_vvvvwaj,target_vvvvwaj);
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+});
+
+// #jform_type listeners for type_vvvvwaj function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwaj = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwaj = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaj(target_vvvvwaj,type_vvvvwaj);
+
+});
+
+// #jform_type listeners for type_vvvvwak function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
+
+});
+
+// #jform_target listeners for target_vvvvwak function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwak = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak,target_vvvvwak);
 
 });
 
diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php
index 13281dd2b..8a35153e3 100644
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@@ -159,33 +159,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvzf function
+// #jform_gettype listeners for gettype_vvvvvzg function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
-	vvvvvzf(gettype_vvvvvzf);
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	vvvvvzg(gettype_vvvvvzg);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
-	vvvvvzf(gettype_vvvvvzf);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvzg function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
+	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	vvvvvzg(gettype_vvvvvzg);
 
 });
 
@@ -249,18 +234,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvzl function
-jQuery('#jform_addcalculation').on('keyup',function()
+// #jform_main_source listeners for main_source_vvvvvzl function
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzl(addcalculation_vvvvvzl);
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
+	vvvvvzl(main_source_vvvvvzl);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzl = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzl(addcalculation_vvvvvzl);
+	var main_source_vvvvvzl = jQuery("#jform_main_source").val();
+	vvvvvzl(main_source_vvvvvzl);
 
 });
 
@@ -268,33 +253,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(addcalculation_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzm function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzm = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(addcalculation_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(addcalculation_vvvvvzm);
 
 });
 
@@ -332,18 +298,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzq function
-jQuery('#jform_main_source').on('keyup',function()
+// #jform_addcalculation listeners for addcalculation_vvvvvzo function
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzq = jQuery("#jform_main_source").val();
-	vvvvvzq(main_source_vvvvvzq);
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
 
 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzq = jQuery("#jform_main_source").val();
-	vvvvvzq(main_source_vvvvvzq);
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzo function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzo = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(addcalculation_vvvvvzo,gettype_vvvvvzo);
 
 });
 
@@ -362,203 +347,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzs function
+// #jform_main_source listeners for main_source_vvvvvzs function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzs = jQuery("#jform_main_source").val();
+	vvvvvzs(main_source_vvvvvzs);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzs = jQuery("#jform_main_source").val();
+	vvvvvzs(main_source_vvvvvzs);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzt function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzs function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvvzs = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_before_getitem_vvvvvzs,gettype_vvvvvzs);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzt function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzt = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzt = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_after_getitem_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_before_getitem_vvvvvzt,gettype_vvvvvzt);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzv function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzu function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzu function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(gettype_vvvvvzv);
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
-	vvvvvzv(gettype_vvvvvzv);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzw function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
+	var add_php_after_getitem_vvvvvzu = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
+	vvvvvzu(add_php_after_getitem_vvvvvzu,gettype_vvvvvzu);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzw function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(gettype_vvvvvzw);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvzw = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(add_php_getlistquery_vvvvvzw,gettype_vvvvvzw);
+	vvvvvzw(gettype_vvvvvzw);
 
 });
 
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzx function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzx function
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzx function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzx = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzx = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
-	vvvvvzx(add_php_before_getitems_vvvvvzx,gettype_vvvvvzx);
+	vvvvvzx(add_php_getlistquery_vvvvvzx,gettype_vvvvvzx);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzy function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzy function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzy function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzy = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzy = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzy = jQuery("#jform_gettype").val();
-	vvvvvzy(add_php_after_getitems_vvvvvzy,gettype_vvvvvzy);
+	vvvvvzy(add_php_before_getitems_vvvvvzy,gettype_vvvvvzy);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwaa function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzz function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzz function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
-	vvvvwaa(gettype_vvvvwaa);
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
-	vvvvwaa(gettype_vvvvwaa);
+	var add_php_after_getitems_vvvvvzz = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
+	vvvvvzz(add_php_after_getitems_vvvvvzz,gettype_vvvvvzz);
 
 });
 
@@ -596,48 +581,63 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	vvvvwad(gettype_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	vvvvwad(gettype_vvvvwad);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwad function
+// #jform_gettype listeners for gettype_vvvvwae function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwae function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwad = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvwad = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvwad(gettype_vvvvwad,add_php_router_parse_vvvvwad);
+	var gettype_vvvvwae = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwae = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwae(gettype_vvvvwae,add_php_router_parse_vvvvwae);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvwaf function
+// #jform_gettype listeners for gettype_vvvvwag function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
-	vvvvwaf(gettype_vvvvwaf);
+	var gettype_vvvvwag = jQuery("#jform_gettype").val();
+	vvvvwag(gettype_vvvvwag);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvwaf = jQuery("#jform_gettype").val();
-	vvvvwaf(gettype_vvvvwaf);
+	var gettype_vvvvwag = jQuery("#jform_gettype").val();
+	vvvvwag(gettype_vvvvwag);
 
 });
 
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index e674967d8..cfa4d71be 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -147,48 +147,33 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwas function
+// #jform_datalenght listeners for datalenght_vvvvwat function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
-	vvvvwas(datalenght_vvvvwas);
+	var datalenght_vvvvwat = jQuery("#jform_datalenght").val();
+	vvvvwat(datalenght_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwas = jQuery("#jform_datalenght").val();
-	vvvvwas(datalenght_vvvvwas);
+	var datalenght_vvvvwat = jQuery("#jform_datalenght").val();
+	vvvvwat(datalenght_vvvvwat);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwat function
+// #jform_datadefault listeners for datadefault_vvvvwau function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
-	vvvvwat(datadefault_vvvvwat);
+	var datadefault_vvvvwau = jQuery("#jform_datadefault").val();
+	vvvvwau(datadefault_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwat = jQuery("#jform_datadefault").val();
-	vvvvwat(datadefault_vvvvwat);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwau function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwau = jQuery("#jform_datatype").val();
-	vvvvwau(datatype_vvvvwau);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwau = jQuery("#jform_datatype").val();
-	vvvvwau(datatype_vvvvwau);
+	var datadefault_vvvvwau = jQuery("#jform_datadefault").val();
+	vvvvwau(datadefault_vvvvwau);
 
 });
 
@@ -207,97 +192,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwaw function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwaw = jQuery("#jform_store").val();
-	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwaw = jQuery("#jform_store").val();
-	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwaw function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwaw = jQuery("#jform_store").val();
 	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+	vvvvwaw(datatype_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwaw = jQuery("#jform_store").val();
 	var datatype_vvvvwaw = jQuery("#jform_datatype").val();
-	vvvvwaw(store_vvvvwaw,datatype_vvvvwaw);
+	vvvvwaw(datatype_vvvvwaw);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvway function
+// #jform_store listeners for store_vvvvwax function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwax function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwax = jQuery("#jform_store").val();
+	var datatype_vvvvwax = jQuery("#jform_datatype").val();
+	vvvvwax(store_vvvvwax,datatype_vvvvwax);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwaz function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvway(add_css_view_vvvvway);
+	var add_css_view_vvvvwaz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwaz(add_css_view_vvvvwaz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvway = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvway(add_css_view_vvvvway);
+	var add_css_view_vvvvwaz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwaz(add_css_view_vvvvwaz);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwaz function
+// #jform_add_css_views listeners for add_css_views_vvvvwba function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaz(add_css_views_vvvvwaz);
+	var add_css_views_vvvvwba = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwba(add_css_views_vvvvwba);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwaz = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaz(add_css_views_vvvvwaz);
+	var add_css_views_vvvvwba = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwba(add_css_views_vvvvwba);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwba function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwbb function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_view_footer_vvvvwba);
+	var add_javascript_view_footer_vvvvwbb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwbb(add_javascript_view_footer_vvvvwbb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwba = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwba(add_javascript_view_footer_vvvvwba);
+	var add_javascript_view_footer_vvvvwbb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwbb(add_javascript_view_footer_vvvvwbb);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwbb function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwbc function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwbb(add_javascript_views_footer_vvvvwbb);
+	var add_javascript_views_footer_vvvvwbc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbc(add_javascript_views_footer_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwbb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwbb(add_javascript_views_footer_vvvvwbb);
+	var add_javascript_views_footer_vvvvwbc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwbc(add_javascript_views_footer_vvvvwbc);
 
 });
 
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index 9f75e8fb2..7a6fa1bef 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -136,344 +136,287 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwbc function
+// #jform_datalenght listeners for datalenght_vvvvwbd function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbc function
+// #jform_has_defaults listeners for has_defaults_vvvvwbd function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwbc = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwbc = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbc(datalenght_vvvvwbc,has_defaults_vvvvwbc);
+	var datalenght_vvvvwbd = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwbd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbd(datalenght_vvvvwbd,has_defaults_vvvvwbd);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwbe function
+// #jform_datadefault listeners for datadefault_vvvvwbf function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbe function
+// #jform_has_defaults listeners for has_defaults_vvvvwbf function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwbe = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwbe = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbe(datadefault_vvvvwbe,has_defaults_vvvvwbe);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbg function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbg function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbg = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbg(datatype_vvvvwbg,has_defaults_vvvvwbg);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbh function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var datadefault_vvvvwbf = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwbf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbf(datadefault_vvvvwbf,has_defaults_vvvvwbf);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwbh function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
-	vvvvwbh(has_defaults_vvvvwbh,datatype_vvvvwbh);
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwbi function
-jQuery('#jform_datatype').on('keyup',function()
+// #jform_has_defaults listeners for has_defaults_vvvvwbh function
+jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbh = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbh = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbh(datatype_vvvvwbh,has_defaults_vvvvwbh);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwbi function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbi(datatype_vvvvwbi,has_defaults_vvvvwbi);
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
 });
 
-// #jform_store listeners for store_vvvvwbk function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbk function
+// #jform_datatype listeners for datatype_vvvvwbi function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
+	var has_defaults_vvvvwbi = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwbi = jQuery("#jform_datatype").val();
+	vvvvwbi(has_defaults_vvvvwbi,datatype_vvvvwbi);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwbk function
+// #jform_datatype listeners for datatype_vvvvwbj function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbj function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbk = jQuery("#jform_store").val();
-	var datatype_vvvvwbk = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwbk = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbk(store_vvvvwbk,datatype_vvvvwbk,has_defaults_vvvvwbk);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwbl function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
-	var store_vvvvwbl = jQuery("#jform_store").val();
-	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	var datatype_vvvvwbj = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbj(datatype_vvvvwbj,has_defaults_vvvvwbj);
 
 });
 
 // #jform_store listeners for store_vvvvwbl function
 jQuery('#jform_store').on('keyup',function()
 {
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbl function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwbl function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var store_vvvvwbl = jQuery("#jform_store").val();
+	var datatype_vvvvwbl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwbl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbl(datatype_vvvvwbl,store_vvvvwbl,has_defaults_vvvvwbl);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwbm function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
-
-});
-
-// #jform_store listeners for store_vvvvwbm function
-jQuery('#jform_store').on('keyup',function()
-{
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
-	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	vvvvwbl(store_vvvvwbl,datatype_vvvvwbl,has_defaults_vvvvwbl);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwbm function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
 	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwbm = jQuery("#jform_store").val();
 	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
-	vvvvwbm(has_defaults_vvvvwbm,store_vvvvwbm,datatype_vvvvwbm);
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+
+// #jform_store listeners for store_vvvvwbm function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbm function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwbm = jQuery("#jform_datatype").val();
+	var store_vvvvwbm = jQuery("#jform_store").val();
+	var has_defaults_vvvvwbm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbm(datatype_vvvvwbm,store_vvvvwbm,has_defaults_vvvvwbm);
 
 });
 
@@ -481,14 +424,71 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 jQuery('#jform_has_defaults').on('keyup',function()
 {
 	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbn(has_defaults_vvvvwbn);
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
 	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwbn(has_defaults_vvvvwbn);
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+
+// #jform_store listeners for store_vvvvwbn function
+jQuery('#jform_store').on('keyup',function()
+{
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwbn function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwbn = jQuery("#jform_store").val();
+	var datatype_vvvvwbn = jQuery("#jform_datatype").val();
+	vvvvwbn(has_defaults_vvvvwbn,store_vvvvwbn,datatype_vvvvwbn);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwbo function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwbo = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbo(has_defaults_vvvvwbo);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwbo = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwbo(has_defaults_vvvvwbo);
 
 });
 
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index d118ef736..c5392c3f2 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -57,7 +57,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->waqfields = $this->get('Waqfields');
+		$this->warfields = $this->get('Warfields');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 2e0d0744f..7871eb94b 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -116,21 +116,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwby function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwby(location_vvvvwby);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwby = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwby(location_vvvvwby);
-
-});
-
 // #jform_location listeners for location_vvvvwbz function
 jQuery('#jform_location').on('keyup',function()
 {
@@ -146,18 +131,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwca function
-jQuery('#jform_type').on('keyup',function()
+// #jform_location listeners for location_vvvvwca function
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwca = jQuery("#jform_type").val();
-	vvvvwca(type_vvvvwca);
+	var location_vvvvwca = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwca(location_vvvvwca);
 
 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwca = jQuery("#jform_type").val();
-	vvvvwca(type_vvvvwca);
+	var location_vvvvwca = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwca(location_vvvvwca);
 
 });
 
@@ -191,18 +176,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwcd function
+// #jform_type listeners for type_vvvvwcd function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwcd = jQuery("#jform_type").val();
+	vvvvwcd(type_vvvvwcd);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwcd = jQuery("#jform_type").val();
+	vvvvwcd(type_vvvvwcd);
+
+});
+
+// #jform_target listeners for target_vvvvwce function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcd(target_vvvvwcd);
+	var target_vvvvwce = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwce(target_vvvvwce);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwcd = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwcd(target_vvvvwcd);
+	var target_vvvvwce = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwce(target_vvvvwce);
 
 });
 
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index 0f5a48490..728c716a4 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -129,18 +129,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvze function
+// #jform_add_php_view listeners for add_php_view_vvvvvzf function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvze(add_php_view_vvvvvze);
+	var add_php_view_vvvvvzf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzf(add_php_view_vvvvvzf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvze(add_php_view_vvvvvze);
+	var add_php_view_vvvvvzf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzf(add_php_view_vvvvvzf);
 
 });
 
diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php
index 0dd3368c0..65d34ea39 100644
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@@ -146,21 +146,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwak function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwak = jQuery("#jform_how").val();
-	vvvvwak(how_vvvvwak);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwak = jQuery("#jform_how").val();
-	vvvvwak(how_vvvvwak);
-
-});
-
 // #jform_how listeners for how_vvvvwal function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -251,18 +236,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwar function
+// #jform_how listeners for how_vvvvwar function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwar = jQuery("#jform_how").val();
+	vvvvwar(how_vvvvwar);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwar = jQuery("#jform_how").val();
+	vvvvwar(how_vvvvwar);
+
+});
+
+// #jform_type listeners for type_vvvvwas function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwar(type_vvvvwar);
+	var type_vvvvwas = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwas(type_vvvvwas);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwar = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwar(type_vvvvwar);
+	var type_vvvvwas = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwas(type_vvvvwas);
 
 });
 
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index 623700476..e75fdb319 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -125,21 +125,6 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwbo function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
-	vvvvwbo(protocol_vvvvwbo);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwbo = jQuery("#jform_protocol").val();
-	vvvvwbo(protocol_vvvvwbo);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvwbp function
 jQuery('#jform_protocol').on('keyup',function()
 {
@@ -159,135 +144,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
+	vvvvwbq(protocol_vvvvwbq);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
+	vvvvwbq(protocol_vvvvwbq);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbq function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwbq = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbq = jQuery("#jform_authentication").val();
-	vvvvwbq(protocol_vvvvwbq,authentication_vvvvwbq);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwbs function
+// #jform_protocol listeners for protocol_vvvvwbr function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbs function
+// #jform_authentication listeners for authentication_vvvvwbr function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbs = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbs = jQuery("#jform_authentication").val();
-	vvvvwbs(protocol_vvvvwbs,authentication_vvvvwbs);
+	var protocol_vvvvwbr = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbr = jQuery("#jform_authentication").val();
+	vvvvwbr(protocol_vvvvwbr,authentication_vvvvwbr);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbu function
+// #jform_protocol listeners for protocol_vvvvwbt function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbu function
+// #jform_authentication listeners for authentication_vvvvwbt function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbu = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbu = jQuery("#jform_authentication").val();
-	vvvvwbu(protocol_vvvvwbu,authentication_vvvvwbu);
+	var protocol_vvvvwbt = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbt = jQuery("#jform_authentication").val();
+	vvvvwbt(protocol_vvvvwbt,authentication_vvvvwbt);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbw function
+// #jform_protocol listeners for protocol_vvvvwbv function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbw function
+// #jform_authentication listeners for authentication_vvvvwbv function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbw = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbw = jQuery("#jform_authentication").val();
-	vvvvwbw(protocol_vvvvwbw,authentication_vvvvwbw);
+	var protocol_vvvvwbv = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbv = jQuery("#jform_authentication").val();
+	vvvvwbv(protocol_vvvvwbv,authentication_vvvvwbv);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbx function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbx function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbx = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbx = jQuery("#jform_authentication").val();
+	vvvvwbx(protocol_vvvvwbx,authentication_vvvvwbx);
 
 });
 
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index 5c7953aea..0f720c642 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -57,7 +57,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->wbalinked_components = $this->get('Wbalinked_components');
+		$this->wbblinked_components = $this->get('Wbblinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index 4bd245ec5..87242ca70 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -166,168 +166,168 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvys function
+// #jform_add_php_view listeners for add_php_view_vvvvvyt function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyt(add_php_view_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyt(add_php_view_vvvvvyt);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyt function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyu function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_display_vvvvvyt);
+	var add_php_jview_display_vvvvvyu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyu(add_php_jview_display_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyt(add_php_jview_display_vvvvvyt);
+	var add_php_jview_display_vvvvvyu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyu(add_php_jview_display_vvvvvyu);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyu function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyv function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyu(add_php_jview_vvvvvyu);
+	var add_php_jview_vvvvvyv = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyv(add_php_jview_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyu = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyu(add_php_jview_vvvvvyu);
+	var add_php_jview_vvvvvyv = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyv(add_php_jview_vvvvvyv);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyv function
+// #jform_add_php_document listeners for add_php_document_vvvvvyw function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyv(add_php_document_vvvvvyv);
+	var add_php_document_vvvvvyw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyw(add_php_document_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyv = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyv(add_php_document_vvvvvyv);
+	var add_php_document_vvvvvyw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyw(add_php_document_vvvvvyw);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyw function
+// #jform_add_css_document listeners for add_css_document_vvvvvyx function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyw(add_css_document_vvvvvyw);
+	var add_css_document_vvvvvyx = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyx(add_css_document_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyw = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyw(add_css_document_vvvvvyw);
+	var add_css_document_vvvvvyx = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyx(add_css_document_vvvvvyx);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyx function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyy function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyx(add_javascript_file_vvvvvyx);
+	var add_javascript_file_vvvvvyy = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyy(add_javascript_file_vvvvvyy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyx = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyx(add_javascript_file_vvvvvyx);
+	var add_javascript_file_vvvvvyy = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyy(add_javascript_file_vvvvvyy);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyy function
+// #jform_add_js_document listeners for add_js_document_vvvvvyz function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyy(add_js_document_vvvvvyy);
+	var add_js_document_vvvvvyz = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyz(add_js_document_vvvvvyz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyy = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyy(add_js_document_vvvvvyy);
+	var add_js_document_vvvvvyz = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyz(add_js_document_vvvvvyz);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyz function
+// #jform_add_css listeners for add_css_vvvvvza function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyz(add_css_vvvvvyz);
+	var add_css_vvvvvza = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvza(add_css_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyz = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyz(add_css_vvvvvyz);
+	var add_css_vvvvvza = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvza(add_css_vvvvvza);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvza function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvzb function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvza(add_php_ajax_vvvvvza);
+	var add_php_ajax_vvvvvzb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvzb(add_php_ajax_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvza = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvza(add_php_ajax_vvvvvza);
+	var add_php_ajax_vvvvvzb = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvzb(add_php_ajax_vvvvvzb);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvzb function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvzc function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzb(add_custom_button_vvvvvzb);
+	var add_custom_button_vvvvvzc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzc(add_custom_button_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvzb = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvzb(add_custom_button_vvvvvzb);
+	var add_custom_button_vvvvvzc = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvzc(add_custom_button_vvvvvzc);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvzc function
+// #jform_button_position listeners for button_position_vvvvvzd function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
-	vvvvvzc(button_position_vvvvvzc);
+	var button_position_vvvvvzd = jQuery("#jform_button_position").val();
+	vvvvvzd(button_position_vvvvvzd);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvzc = jQuery("#jform_button_position").val();
-	vvvvvzc(button_position_vvvvvzc);
+	var button_position_vvvvvzd = jQuery("#jform_button_position").val();
+	vvvvvzd(button_position_vvvvvzd);
 
 });
 
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index 523d96a1f..84da6a428 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -129,18 +129,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzd function
+// #jform_add_php_view listeners for add_php_view_vvvvvze function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvze(add_php_view_vvvvvze);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzd(add_php_view_vvvvvzd);
+	var add_php_view_vvvvvze = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvze(add_php_view_vvvvvze);
 
 });
 
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 6f71d51a8..07fb17263 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -7,9 +7,9 @@
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.9.19</version>
+	<version>2.9.20</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.9.19)</h1>
+		<h1>Component Builder (v.2.9.20)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 4501c05b0..fabcca403 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -687,7 +687,24 @@
 		<version>2.9.19</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.20/JCB_v2.9.20.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.9.20</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.20/JCB_v2.9.20.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
diff --git a/script.php b/script.php
index ea6a5ae89..1e0439d9d 100644
--- a/script.php
+++ b/script.php
@@ -3692,9 +3692,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems_after_all","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_after_delete":"add_php_after_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchmove":"add_php_batchmove","add_sql":"add_sql","add_php_after_publish":"add_php_after_publish","html_import_view":"html_import_view","mysql_table_engine":"mysql_table_engine","type":"type","not_required":"not_required","php_import_save":"php_import_save","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder_type":"alias_builder_type","mysql_table_collate":"mysql_table_collate","add_custom_import":"add_custom_import","alias_builder":"alias_builder","php_import_headers":"php_import_headers","name_list":"name_list","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","mysql_table_charset":"mysql_table_charset","php_controller_list":"php_controller_list","mysql_table_row_format":"mysql_table_row_format","php_model_list":"php_model_list","source":"source","add_php_ajax":"add_php_ajax","sql":"sql","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","add_php_getitem":"add_php_getitem","php_import":"php_import","php_getitem":"php_getitem","php_import_setdata":"php_import_setdata","add_php_getitems":"add_php_getitems","php_import_ext":"php_import_ext","php_getitems":"php_getitems"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems_after_all","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","name_list":"name_list","icon":"icon","add_php_before_delete":"add_php_before_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchcopy":"add_php_batchcopy","mysql_table_collate":"mysql_table_collate","add_php_before_publish":"add_php_before_publish","add_custom_import":"add_custom_import","add_php_document":"add_php_document","type":"type","not_required":"not_required","php_import_headers":"php_import_headers","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_after_cancel":"add_php_after_cancel","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","alias_builder_type":"alias_builder_type","mysql_table_engine":"mysql_table_engine","add_sql":"add_sql","alias_builder":"alias_builder","html_import_view":"html_import_view","php_import_save":"php_import_save","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_after_cancel":"php_after_cancel","javascript_views_file":"javascript_views_file","php_batchcopy":"php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","php_batchmove":"php_batchmove","javascript_views_footer":"javascript_views_footer","php_before_publish":"php_before_publish","add_custom_button":"add_custom_button","php_after_publish":"php_after_publish","php_before_delete":"php_before_delete","php_controller":"php_controller","php_after_delete":"php_after_delete","php_model":"php_model","php_document":"php_document","php_controller_list":"php_controller_list","mysql_table_charset":"mysql_table_charset","php_model_list":"php_model_list","mysql_table_row_format":"mysql_table_row_format","add_php_ajax":"add_php_ajax","source":"source","php_ajaxmethod":"php_ajaxmethod","sql":"sql","add_php_getitem":"add_php_getitem","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import":"php_import","add_php_getitems":"add_php_getitems","php_import_setdata":"php_import_setdata","php_getitems":"php_getitems","php_import_ext":"php_import_ext","add_php_getitems_after_all":"add_php_getitems_after_all"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_after_delete","add_fadein","add_php_batchmove","add_sql","add_php_after_publish","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem","add_php_getitems"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_before_delete","add_fadein","add_php_batchcopy","add_php_before_publish","add_custom_import","add_php_document","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_after_cancel","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","add_php_ajax","source","add_php_getitem","add_php_getitems","add_php_getitems_after_all"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -4179,9 +4179,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems_after_all","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","add_php_after_delete":"add_php_after_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchmove":"add_php_batchmove","add_sql":"add_sql","add_php_after_publish":"add_php_after_publish","html_import_view":"html_import_view","mysql_table_engine":"mysql_table_engine","type":"type","not_required":"not_required","php_import_save":"php_import_save","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_batchcopy":"add_php_batchcopy","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder_type":"alias_builder_type","mysql_table_collate":"mysql_table_collate","add_custom_import":"add_custom_import","alias_builder":"alias_builder","php_import_headers":"php_import_headers","name_list":"name_list","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","mysql_table_charset":"mysql_table_charset","php_controller_list":"php_controller_list","mysql_table_row_format":"mysql_table_row_format","php_model_list":"php_model_list","source":"source","add_php_ajax":"add_php_ajax","sql":"sql","php_ajaxmethod":"php_ajaxmethod","php_import_display":"php_import_display","add_php_getitem":"add_php_getitem","php_import":"php_import","php_getitem":"php_getitem","php_import_setdata":"php_import_setdata","add_php_getitems":"add_php_getitems","php_import_ext":"php_import_ext","php_getitems":"php_getitems"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems_after_all","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","short_description":"short_description","add_php_before_cancel":"add_php_before_cancel","add_php_allowadd":"add_php_allowadd","add_php_save":"add_php_save","add_php_getform":"add_php_getform","name_list":"name_list","icon":"icon","add_php_before_delete":"add_php_before_delete","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","icon_add":"icon_add","add_php_batchcopy":"add_php_batchcopy","mysql_table_collate":"mysql_table_collate","add_php_before_publish":"add_php_before_publish","add_custom_import":"add_custom_import","add_php_document":"add_php_document","type":"type","not_required":"not_required","php_import_headers":"php_import_headers","add_php_getlistquery":"add_php_getlistquery","add_php_before_save":"add_php_before_save","add_php_postsavehook":"add_php_postsavehook","add_php_allowedit":"add_php_allowedit","add_php_after_cancel":"add_php_after_cancel","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","alias_builder_type":"alias_builder_type","mysql_table_engine":"mysql_table_engine","add_sql":"add_sql","alias_builder":"alias_builder","html_import_view":"html_import_view","php_import_save":"php_import_save","php_getitems_after_all":"php_getitems_after_all","add_css_view":"add_css_view","php_getlistquery":"php_getlistquery","css_view":"css_view","php_getform":"php_getform","add_css_views":"add_css_views","php_before_save":"php_before_save","css_views":"css_views","php_save":"php_save","add_javascript_view_file":"add_javascript_view_file","php_postsavehook":"php_postsavehook","javascript_view_file":"javascript_view_file","php_allowadd":"php_allowadd","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_before_cancel":"php_before_cancel","add_javascript_views_file":"add_javascript_views_file","php_after_cancel":"php_after_cancel","javascript_views_file":"javascript_views_file","php_batchcopy":"php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","php_batchmove":"php_batchmove","javascript_views_footer":"javascript_views_footer","php_before_publish":"php_before_publish","add_custom_button":"add_custom_button","php_after_publish":"php_after_publish","php_before_delete":"php_before_delete","php_controller":"php_controller","php_after_delete":"php_after_delete","php_model":"php_model","php_document":"php_document","php_controller_list":"php_controller_list","mysql_table_charset":"mysql_table_charset","php_model_list":"php_model_list","mysql_table_row_format":"mysql_table_row_format","add_php_ajax":"add_php_ajax","source":"source","php_ajaxmethod":"php_ajaxmethod","sql":"sql","add_php_getitem":"add_php_getitem","php_import_display":"php_import_display","php_getitem":"php_getitem","php_import":"php_import","add_php_getitems":"add_php_getitems","php_import_setdata":"php_import_setdata","php_getitems":"php_getitems","php_import_ext":"php_import_ext","add_php_getitems_after_all":"add_php_getitems_after_all"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_getitems_after_all","add_php_after_delete","add_fadein","add_php_batchmove","add_sql","add_php_after_publish","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem","add_php_getitems"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_cancel","add_php_allowadd","add_php_save","add_php_getform","add_php_before_delete","add_fadein","add_php_batchcopy","add_php_before_publish","add_custom_import","add_php_document","type","add_php_getlistquery","add_php_before_save","add_php_postsavehook","add_php_allowedit","add_php_after_cancel","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","add_php_ajax","source","add_php_getitem","add_php_getitems","add_php_getitems_after_all"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -5426,7 +5426,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.9.19 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.9.20 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 
-- 
2.40.1


From 236ecd53f424a3735b62018097babd1d4d6602cc Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 13 Jun 2019 18:45:55 +0200
Subject: [PATCH 16/26] Fixed gh-424 so that the global settings of JCB will
 save even if the components are not selected in the Development Method tab.

---
 README.md                         |  4 ++--
 admin/README.txt                  |  4 ++--
 admin/config.xml                  |  2 --
 admin/models/fields/component.php | 34 +++++++++++++++----------------
 componentbuilder.xml              |  2 +-
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index e757a3493..06fedd73c 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 12th June, 2019
++ *Last Build*: 13th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206854**
++ *Line count*: **206852**
 + *Field count*: **1140**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index e757a3493..06fedd73c 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 12th June, 2019
++ *Last Build*: 13th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206854**
++ *Line count*: **206852**
 + *Field count*: **1140**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/config.xml b/admin/config.xml
index 7ece41d41..b5e9f989e 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -711,7 +711,6 @@
 					class="list_class"
 					multiple="false"
 					default="0"
-					required="true"
 					button="false"
 				/>
 				<!-- Backup Field. Type: Checkbox. (joomla) -->
@@ -840,7 +839,6 @@
 			class="text_area"
 			readonly="false"
 			disabled="false"
-			required="true"
 			filter="STRING"
 			message="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_MESSAGE"
 			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT"
diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php
index 9d42bd301..06c94d826 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -143,23 +143,23 @@ class JFormFieldComponent extends JFormFieldList
 	protected function getOptions()
 	{
 		$db = JFactory::getDBO();
-$query = $db->getQuery(true);
-$query->select($db->quoteName(array('a.id','a.system_name'),array('id','component_system_name')));
-$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
-$query->where($db->quoteName('a.published') . ' >= 1');
-$query->order('a.system_name ASC');
-$db->setQuery((string)$query);
-$items = $db->loadObjectList();
-$options = array();
-if ($items)
-{
-	$options[] = JHtml::_('select.option', '', 'Select an option');
-	foreach($items as $item)
-	{
-		$options[] = JHtml::_('select.option', $item->id, $item->component_system_name);
-	}
-}
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','component_system_name')));
+		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
+		$query->where($db->quoteName('a.published') . ' >= 1');
+		$query->order('a.system_name ASC');
+		$db->setQuery((string)$query);
+		$items = $db->loadObjectList();
+		$options = array();
+		if ($items)
+		{
+			$options[] = JHtml::_('select.option', '', 'Select an option');
+			foreach($items as $item)
+			{
+				$options[] = JHtml::_('select.option', $item->id, $item->component_system_name);
+			}
+		}
 
-return $options;
+		return $options;
 	}
 }
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 07fb17263..76127e790 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>12th June, 2019</creationDate>
+	<creationDate>13th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From 2fb4a1ae4330333483e57d43a1c81a53fc78d2c0 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 13 Jun 2019 23:12:16 +0200
Subject: [PATCH 17/26] Improved the getInput method for custom fields, so to
 allow the edit button to show more consistently.

---
 README.md                                   |   2 +-
 admin/README.txt                            |   2 +-
 admin/helpers/compiler/c_Fields.php         |  68 +++----
 admin/helpers/compiler/e_Interpretation.php | 214 ++++++++++----------
 admin/helpers/compiler/f_Infusion.php       |  18 +-
 admin/models/fields/component.php           |  51 +++--
 admin/models/fields/dynamicget.php          |  51 +++--
 admin/models/fields/fieldtypes.php          |  51 +++--
 admin/models/fields/libraries.php           |  51 +++--
 admin/models/fields/librariesx.php          |  51 +++--
 admin/models/fields/library.php             |  51 +++--
 admin/models/fields/maingets.php            |  51 +++--
 admin/models/fields/servers.php             |  51 +++--
 admin/models/fields/snippets.php            |  51 +++--
 14 files changed, 367 insertions(+), 396 deletions(-)

diff --git a/README.md b/README.md
index 06fedd73c..8f374c176 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206852**
++ *Line count*: **206816**
 + *Field count*: **1140**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 06fedd73c..8f374c176 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206852**
++ *Line count*: **206816**
 + *Field count*: **1140**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 01fd00e91..179c8dedb 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -2868,9 +2868,9 @@ class Fields extends Structure
 				$this->bbb . 'CODE' . $this->ddd => $data['code'],
 				$this->bbb . 'view_type' . $this->ddd => $view_name_single . '_' . $data['type'],
 				$this->bbb . 'type' . $this->ddd => $data['type'],
-				$this->bbb . 'com_component' . $this->ddd => (isset($data['custom']['component']) && ComponentbuilderHelper::checkString($data['custom']['component'])) ? ComponentbuilderHelper::safeString($data['custom']['component']) : 'com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh],
+				$this->bbb . 'com_component' . $this->ddd => (isset($data['custom']['component']) && ComponentbuilderHelper::checkString($data['custom']['component'])) ? ComponentbuilderHelper::safeString($data['custom']['component']) : 'com_' . $this->componentCodeName,
 				// set the generic values
-				$this->bbb . 'component' . $this->ddd => $this->fileContentStatic[$this->hhh . 'component' . $this->hhh],
+				$this->bbb . 'component' . $this->ddd => $this->componentCodeName,
 				$this->bbb . 'Component' . $this->ddd => $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
 				$this->bbb . 'view' . $this->ddd => (isset($data['custom']['view']) && ComponentbuilderHelper::checkString($data['custom']['view'])) ? ComponentbuilderHelper::safeString($data['custom']['view']) : $view_name_single,
 				$this->bbb . 'views' . $this->ddd => (isset($data['custom']['views']) && ComponentbuilderHelper::checkString($data['custom']['views'])) ? ComponentbuilderHelper::safeString($data['custom']['views']) : $view_name_list
@@ -3038,7 +3038,7 @@ class Fields extends Structure
 			ComponentbuilderHelper::checkString($fieldData['view']) && ComponentbuilderHelper::checkString($fieldData['views']))
 		{
 			// set local component
-			$local_component = "com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+			$local_component = "com_" . $this->componentCodeName;
 			// check that the component value is set
 			if (!isset($fieldData['component']) || !ComponentbuilderHelper::checkString($fieldData['component']))
 			{
@@ -3054,6 +3054,10 @@ class Fields extends Structure
 			{
 				$fieldData['component'] = $this->setPlaceholders($fieldData['component'], $this->placeholders);
 			}
+			// get core permissions
+			$coreLoad = false;
+			// add ref tags
+			$refLoad = true;
 			// fall back on the field component
 			$component = $fieldData['component'];
 			// check if we should add ref tags (since it only works well on local views)
@@ -3062,10 +3066,7 @@ class Fields extends Structure
 				// do not add ref tags
 				$refLoad = false;
 			}
-			// get core permissions
-			$coreLoad = false;
-			// add ref tags
-			$refLoad = true;
+			// get core permisssions
 			if (isset($this->permissionCore[$fieldData['view']]))
 			{
 				// get the core permission naming array
@@ -3085,15 +3086,15 @@ class Fields extends Structure
 			$addButton[] = $this->_t(1) . "protected function getInput()";
 			$addButton[] = $this->_t(1) . "{";
 			$addButton[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " see if we should add buttons";
-			$addButton[] = $this->_t(2) . "\$setButton = \$this->getAttribute('button');";
+			$addButton[] = $this->_t(2) . "\$set_button = \$this->getAttribute('button');";
 			$addButton[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " get html";
 			$addButton[] = $this->_t(2) . "\$html = parent::getInput();";
 			$addButton[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " if true set button";
-			$addButton[] = $this->_t(2) . "if (\$setButton === 'true')";
+			$addButton[] = $this->_t(2) . "if (\$set_button === 'true')";
 			$addButton[] = $this->_t(2) . "{";
 			$addButton[] = $this->_t(3) . "\$button = array();";
 			$addButton[] = $this->_t(3) . "\$script = array();";
-			$addButton[] = $this->_t(3) . "\$buttonName = \$this->getAttribute('name');";
+			$addButton[] = $this->_t(3) . "\$button_code_name = \$this->getAttribute('name');";
 			$addButton[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " get the input from url";
 			$addButton[] = $this->_t(3) . "\$app = JFactory::getApplication();";
 			$addButton[] = $this->_t(3) . "\$jinput = \$app->input;";
@@ -3135,6 +3136,13 @@ class Fields extends Structure
 				$addButton[] = $this->_t(4) . "\$refJ = '&return=' . \$_return;";
 				$addButton[] = $this->_t(3) . "}";
 			}
+			$addButton[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " get button label";
+			$addButton[] = $this->_t(3) . "\$button_label = trim(\$button_code_name);";
+			$addButton[] = $this->_t(3) . "\$button_label = preg_replace('/_+/', ' ', \$button_label);";
+			$addButton[] = $this->_t(3) . "\$button_label = preg_replace('/\s+/', ' ', \$button_label);";
+			$addButton[] = $this->_t(3) . "\$button_label = preg_replace(\"/[^A-Za-z ]/\", '', \$button_label);";
+			$addButton[] = $this->_t(3) . "\$button_label = ucfirst(strtolower(\$button_label));";
+			$addButton[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " get user object";
 			$addButton[] = $this->_t(3) . "\$user = JFactory::getUser();";
 			$addButton[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " only add if user allowed to create " . $fieldData['view'];
 			// check if the item has permissions.
@@ -3148,12 +3156,7 @@ class Fields extends Structure
 			}
 			$addButton[] = $this->_t(3) . "{";
 			$addButton[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " build Create button";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = trim(\$buttonName);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
-			$addButton[] = $this->_t(4) . "\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_CREATE_NEW_S', \$buttonNamee).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
+			$addButton[] = $this->_t(4) . "\$button[] = '<a id=\"'.\$button_code_name.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_CREATE_NEW_S', \$button_label).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
 			$addButton[] = $this->_t(5) . "href=\"index.php?option=" . $fieldData['component'] . "&amp;view=" . $fieldData['view'] . "&amp;layout=edit'.\$ref.'\" >";
 			$addButton[] = $this->_t(5) . "<span class=\"icon-new icon-white\"></span></a>';";
 			$addButton[] = $this->_t(3) . "}";
@@ -3161,45 +3164,40 @@ class Fields extends Structure
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($fieldData['view'], $this->permissionBuilder['global'][$core['core.edit']]))
 			{
-				$addButton[] = $this->_t(3) . "if ((\$buttonName === '" . $fieldData['view'] . "' || \$buttonName === '" . $fieldData['views'] . "') && \$user->authorise('" . $core['core.edit'] . "', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
+				$addButton[] = $this->_t(3) . "if (\$user->authorise('" . $core['core.edit'] . "', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
 			}
 			else
 			{
-				$addButton[] = $this->_t(3) . "if ((\$buttonName === '" . $fieldData['view'] . "' || \$buttonName === '" . $fieldData['views'] . "')  && \$user->authorise('core.edit', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
+				$addButton[] = $this->_t(3) . "if (\$user->authorise('core.edit', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
 			}
 			$addButton[] = $this->_t(3) . "{";
 			$addButton[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " build edit button";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = trim(\$buttonName);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
-			$addButton[] = $this->_t(4) . "\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
-			$addButton[] = $this->_t(4) . "\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_EDIT_S', \$buttonNamee).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
+			$addButton[] = $this->_t(4) . "\$button[] = '<a id=\"'.\$button_code_name.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_EDIT_S', \$button_label).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
 			$addButton[] = $this->_t(5) . "<span class=\"icon-edit\"></span></a>';";
 			$addButton[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " build script";
 			$addButton[] = $this->_t(4) . "\$script[] = \"";
 			$addButton[] = $this->_t(5) . "jQuery(document).ready(function() {";
-			$addButton[] = $this->_t(6) . "jQuery('#adminForm').on('change', '#jform_\".\$buttonName.\"',function (e) {";
+			$addButton[] = $this->_t(6) . "jQuery('#adminForm').on('change', '#jform_\".\$button_code_name.\"',function (e) {";
 			$addButton[] = $this->_t(7) . "e.preventDefault();";
-			$addButton[] = $this->_t(7) . "var \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
-			$addButton[] = $this->_t(7) . "\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+			$addButton[] = $this->_t(7) . "var \".\$button_code_name.\"Value = jQuery('#jform_\".\$button_code_name.\"').val();";
+			$addButton[] = $this->_t(7) . "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
 			$addButton[] = $this->_t(6) . "});";
-			$addButton[] = $this->_t(6) . "var \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
-			$addButton[] = $this->_t(6) . "\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+			$addButton[] = $this->_t(6) . "var \".\$button_code_name.\"Value = jQuery('#jform_\".\$button_code_name.\"').val();";
+			$addButton[] = $this->_t(6) . "\".\$button_code_name.\"Button(\".\$button_code_name.\"Value);";
 			$addButton[] = $this->_t(5) . "});";
-			$addButton[] = $this->_t(5) . "function \".\$buttonName.\"Button(value) {";
+			$addButton[] = $this->_t(5) . "function \".\$button_code_name.\"Button(value) {";
 			$addButton[] = $this->_t(6) . "if (value > 0) {"; // TODO not ideal since value may not be an (int)
 			$addButton[] = $this->_t(7) . "// hide the create button";
-			$addButton[] = $this->_t(7) . "jQuery('#\".\$buttonName.\"Create').hide();";
+			$addButton[] = $this->_t(7) . "jQuery('#\".\$button_code_name.\"Create').hide();";
 			$addButton[] = $this->_t(7) . "// show edit button";
-			$addButton[] = $this->_t(7) . "jQuery('#\".\$buttonName.\"Edit').show();";
+			$addButton[] = $this->_t(7) . "jQuery('#\".\$button_code_name.\"Edit').show();";
 			$addButton[] = $this->_t(7) . "var url = 'index.php?option=" . $fieldData['component'] . "&view=" . $fieldData['views'] . "&task=" . $fieldData['view'] . ".edit&id='+value+'\".\$refJ.\"';"; // TODO this value may not be the ID
-			$addButton[] = $this->_t(7) . "jQuery('#\".\$buttonName.\"Edit').attr('href', url);";
+			$addButton[] = $this->_t(7) . "jQuery('#\".\$button_code_name.\"Edit').attr('href', url);";
 			$addButton[] = $this->_t(6) . "} else {";
 			$addButton[] = $this->_t(7) . "// show the create button";
-			$addButton[] = $this->_t(7) . "jQuery('#\".\$buttonName.\"Create').show();";
+			$addButton[] = $this->_t(7) . "jQuery('#\".\$button_code_name.\"Create').show();";
 			$addButton[] = $this->_t(7) . "// hide edit button";
-			$addButton[] = $this->_t(7) . "jQuery('#\".\$buttonName.\"Edit').hide();";
+			$addButton[] = $this->_t(7) . "jQuery('#\".\$button_code_name.\"Edit').hide();";
 			$addButton[] = $this->_t(6) . "}";
 			$addButton[] = $this->_t(5) . "}\";";
 			$addButton[] = $this->_t(3) . "}";
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 70bf10151..3328eb595 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -245,7 +245,7 @@ class Interpretation extends Fields
 		if (isset($this->componentData->add_email_helper) && $this->componentData->add_email_helper)
 		{
 			// set email helper in place with component name
-			$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+			$component = $this->componentCodeName;
 			$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
 			$target = array('admin' => 'emailer');
 			$done = $this->buildDynamique($target, 'emailer', $component);
@@ -362,12 +362,12 @@ class Interpretation extends Fields
 		$bool[] = $this->_t(3) . "return \$this->" . $globalbool . ";";
 		$bool[] = $this->_t(2) . "}";
 		$bool[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params";
-		$bool[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
+		$bool[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->componentCodeName . "', true);";
 		$bool[] = $this->_t(2) . "\$whmcs_key = \$params->get('whmcs_key', null);";
 		$bool[] = $this->_t(2) . "if (\$whmcs_key)";
 		$bool[] = $this->_t(2) . "{";
 		$bool[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " load the file";
-		$bool[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
+		$bool[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->componentCodeName . "');";
 		$bool[] = $this->_t(3) . "\$the = new WHMCS(\$whmcs_key);";
 		$bool[] = $this->_t(3) . "\$this->" . $globalbool . " = \$the->_is;";
 		$bool[] = $this->_t(3) . "return \$this->" . $globalbool . ";";
@@ -394,12 +394,12 @@ class Interpretation extends Fields
 		$helper[] = $this->_t(1) . "public static function isGenuine()";
 		$helper[] = $this->_t(1) . "{";
 		$helper[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params";
-		$helper[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
+		$helper[] = $this->_t(2) . "\$params = JComponentHelper::getParams('com_" . $this->componentCodeName . "', true);";
 		$helper[] = $this->_t(2) . "\$whmcs_key = \$params->get('whmcs_key', null);";
 		$helper[] = $this->_t(2) . "if (\$whmcs_key)";
 		$helper[] = $this->_t(2) . "{";
 		$helper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " load the file";
-		$helper[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
+		$helper[] = $this->_t(3) . "JLoader::import( 'whmcs', JPATH_ADMINISTRATOR .'/components/com_" . $this->componentCodeName . "');";
 		$helper[] = $this->_t(3) . "\$the = new WHMCS(\$whmcs_key);";
 		$helper[] = $this->_t(3) . "return \$the->_is;";
 		$helper[] = $this->_t(2) . "}";
@@ -651,7 +651,7 @@ class Interpretation extends Fields
 				$this->fileContentStatic[$this->hhh . 'WHMCS_ENCRYPT_FILE' . $this->hhh] = PHP_EOL . $this->_t(3) . "<filename>whmcs.php</filename>";
 			}
 			// get component name
-			$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+			$component = $this->componentCodeName;
 			// set the getCryptKey function to the helper class
 			$function = array();
 			// start building the getCryptKey function/class method
@@ -857,7 +857,7 @@ class Interpretation extends Fields
 			// UPDATESERVER
 			$updateServer = array();
 			$updateServer[] = PHP_EOL . $this->_t(1) . "<updateservers>";
-			$updateServer[] = $this->_t(2) . '<server type="extension" enabled="1" element="com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '" name="' . $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh] . '">' . $this->componentData->update_server_url . '</server>';
+			$updateServer[] = $this->_t(2) . '<server type="extension" enabled="1" element="com_' . $this->componentCodeName . '" name="' . $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh] . '">' . $this->componentData->update_server_url . '</server>';
 			$updateServer[] = $this->_t(1) . '</updateservers>';
 			// return the array to string
 			$updateServer = implode(PHP_EOL, $updateServer);
@@ -1008,7 +1008,7 @@ class Interpretation extends Fields
 			$updateXML[] = $this->_t(1) . "<update>";
 			$updateXML[] = $this->_t(2) . "<name>" . $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh] . "</name>";
 			$updateXML[] = $this->_t(2) . "<description>" . $this->fileContentStatic[$this->hhh . 'SHORT_DESCRIPTION' . $this->hhh] . "</description>";
-			$updateXML[] = $this->_t(2) . "<element>com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "</element>";
+			$updateXML[] = $this->_t(2) . "<element>com_" . $this->componentCodeName . "</element>";
 			$updateXML[] = $this->_t(2) . "<type>component</type>";
 			$updateXML[] = $this->_t(2) . "<version>" . $update['version'] . "</version>";
 			$updateXML[] = $this->_t(2) . '<infourl title="' . $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh] . '!">' . $this->fileContentStatic[$this->hhh . 'AUTHORWEBSITE' . $this->hhh] . '</infourl>';
@@ -1091,7 +1091,7 @@ class Interpretation extends Fields
 		$help[] = $this->_t(2) . "\$db	= JFactory::getDbo();";
 		$help[] = $this->_t(2) . "\$query	= \$db->getQuery(true);";
 		$help[] = $this->_t(2) . "\$query->select(array('a.id','a.groups','a.target','a.type','a.article','a.url'));";
-		$help[] = $this->_t(2) . "\$query->from('#__" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_help_document AS a');";
+		$help[] = $this->_t(2) . "\$query->from('#__" . $this->componentCodeName . "_help_document AS a');";
 		$help[] = $this->_t(2) . "\$query->where('a." . $target . " = '.\$db->quote(\$view));";
 		$help[] = $this->_t(2) . "\$query->where('a.location = " . (int) $location . "');";
 		$help[] = $this->_t(2) . "\$query->where('a.published = 1');";
@@ -1148,7 +1148,7 @@ class Interpretation extends Fields
 		$help[] = $this->_t(1) . "protected static function loadHelpTextLink(\$id)";
 		$help[] = $this->_t(1) . "{";
 		$help[] = $this->_t(2) . "\$token = JSession::getFormToken();";
-		$help[] = $this->_t(2) . "return 'index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&task=help.getText&id=' . (int) \$id . '&token=' . \$token;";
+		$help[] = $this->_t(2) . "return 'index.php?option=com_" . $this->componentCodeName . "&task=help.getText&id=' . (int) \$id . '&token=' . \$token;";
 		$help[] = $this->_t(1) . "}";
 		// return the help methods
 		return implode(PHP_EOL, $help);
@@ -1486,7 +1486,7 @@ class Interpretation extends Fields
 		if ($this->buildDynamique($target, 'admin_menu'))
 		{
 			// set the lang
-			$lang = ComponentbuilderHelper::safeString('com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_menu_' . $viewName_single, 'U');
+			$lang = ComponentbuilderHelper::safeString('com_' . $this->componentCodeName . '_menu_' . $viewName_single, 'U');
 			$this->langContent['adminsys'][$lang . '_TITLE'] = 'Create ' . $view['settings']->name_single;
 			$this->langContent['adminsys'][$lang . '_OPTION'] = 'Create ' . $view['settings']->name_single;
 			$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->short_description;
@@ -1516,7 +1516,7 @@ class Interpretation extends Fields
 		if ($this->buildDynamique($target, 'menu'))
 		{
 			// set the lang
-			$lang = ComponentbuilderHelper::safeString('com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_menu_' . $view['settings']->code, 'U');
+			$lang = ComponentbuilderHelper::safeString('com_' . $this->componentCodeName . '_menu_' . $view['settings']->code, 'U');
 			$this->langContent['adminsys'][$lang . '_TITLE'] = $view['settings']->name;
 			$this->langContent['adminsys'][$lang . '_OPTION'] = $view['settings']->name;
 			$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->description;
@@ -1533,8 +1533,8 @@ class Interpretation extends Fields
 				$xml .= PHP_EOL . $this->_t(1) . '<!--' . $this->setLine(__LINE__) . ' Add fields to the request variables for the layout. -->';
 				$xml .= PHP_EOL . $this->_t(1) . '<fields name="request">';
 				$xml .= PHP_EOL . $this->_t(2) . '<fieldset name="request"';
-				$xml .= PHP_EOL . $this->_t(3) . 'addrulepath="/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/models/rules"';
-				$xml .= PHP_EOL . $this->_t(3) . 'addfieldpath="/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/models/fields">';
+				$xml .= PHP_EOL . $this->_t(3) . 'addrulepath="/administrator/components/com_' . $this->componentCodeName . '/models/rules"';
+				$xml .= PHP_EOL . $this->_t(3) . 'addfieldpath="/administrator/components/com_' . $this->componentCodeName . '/models/fields">';
 				if (isset($this->hasIdRequest[$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->hasIdRequest[$view['settings']->code]))
 				{
 					foreach ($this->hasIdRequest[$view['settings']->code] as $requestFieldXML)
@@ -1562,8 +1562,8 @@ class Interpretation extends Fields
 					$xml .= PHP_EOL . $this->_t(1) . '<!--' . $this->setLine(__LINE__) . ' Adding page parameters -->';
 					$xml .= PHP_EOL . $this->_t(1) . '<fields name="params">';
 					$xml .= PHP_EOL . $this->_t(2) . '<fieldset name="basic" label="COM_' . $this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh] . '"';
-					$xml .= PHP_EOL . $this->_t(3) . 'addrulepath="/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/models/rules"';
-					$xml .= PHP_EOL . $this->_t(3) . 'addfieldpath="/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/models/fields">';
+					$xml .= PHP_EOL . $this->_t(3) . 'addrulepath="/administrator/components/com_' . $this->componentCodeName . '/models/rules"';
+					$xml .= PHP_EOL . $this->_t(3) . 'addfieldpath="/administrator/components/com_' . $this->componentCodeName . '/models/fields">';
 					$xml .= implode($this->_t(3), $params);
 					$xml .= PHP_EOL . $this->_t(2) . '</fieldset>';
 					$xml .= PHP_EOL . $this->_t(1) . '</fields>';
@@ -1864,7 +1864,7 @@ class Interpretation extends Fields
 		$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
 		// set context 
 		$context = (isset($get['context'])) ? $get['context'] : $code;
-		$context = 'com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.' . $context;
+		$context = 'com_' . $this->componentCodeName . '.' . $context;
 		// load parms builder only once
 		$params = false;
 		foreach ($checker as $field => $array)
@@ -2317,7 +2317,7 @@ class Interpretation extends Fields
 			if (isset($this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh]) && $this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh] != $view['settings']->code)
 			{
 				$redirectMessage = $this->_t(3) . "//" . $this->setLine(__LINE__) . " redirect away to the default view if no access allowed.";
-				$redirectString = "JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh] . "')";
+				$redirectString = "JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=" . $this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh] . "')";
 			}
 			else
 			{
@@ -2325,7 +2325,7 @@ class Interpretation extends Fields
 				$redirectString = 'JURI::root()';
 			}
 			$accessCheck[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if this user has permission to access item";
-			$accessCheck[] = $this->_t(2) . "if (!" . $userString . "->authorise('site." . $view['settings']->code . ".access', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+			$accessCheck[] = $this->_t(2) . "if (!" . $userString . "->authorise('site." . $view['settings']->code . ".access', 'com_" . $this->componentCodeName . "'))";
 			$accessCheck[] = $this->_t(2) . "{";
 			$accessCheck[] = $this->_t(3) . "\$app = JFactory::getApplication();";
 			// set lang
@@ -2423,7 +2423,7 @@ class Interpretation extends Fields
 					// check that the default and the redirect page is not the same
 					if (isset($this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh]) && $this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh] != $code)
 					{
-						$redirectString = "JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh] . "')";
+						$redirectString = "JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=" . $this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh] . "')";
 					}
 					else
 					{
@@ -2433,7 +2433,7 @@ class Interpretation extends Fields
 				}
 				else
 				{
-					$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "\$app->redirect('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "');";
+					$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "\$app->redirect('index.php?option=com_" . $this->componentCodeName . "');";
 				}
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "return false;";
 			}
@@ -2588,7 +2588,7 @@ class Interpretation extends Fields
 					$main .= PHP_EOL . $this->_t(3) . "\$this->initSet = true;";
 					$main .= PHP_EOL . $this->_t(2) . "}";
 					$main .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get the global params";
-					$main .= PHP_EOL . $this->_t(2) . "\$globalParams = JComponentHelper::getParams('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "', true);";
+					$main .= PHP_EOL . $this->_t(2) . "\$globalParams = JComponentHelper::getParams('com_" . $this->componentCodeName . "', true);";
 					// set php before listquery
 					if (isset($view->add_php_getlistquery) && $view->add_php_getlistquery == 1 && isset($view->php_getlistquery) && ComponentbuilderHelper::checkString($view->php_getlistquery))
 					{
@@ -3366,12 +3366,12 @@ class Interpretation extends Fields
 					{
 						// TODO the onContentPrepare already gets triggered on the fields of its relation
 						// $method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " onContentPrepare Event Trigger.";
-						// $method .= PHP_EOL . $this->_t(2) . "\$dispatcher->trigger('onContentPrepare', array ('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . ".article', &\$this->item, &\$this->params, 0));";
+						// $method .= PHP_EOL . $this->_t(2) . "\$dispatcher->trigger('onContentPrepare', array ('com_" . $this->componentCodeName . ".article', &\$this->item, &\$this->params, 0));";
 					}
 					else
 					{
 						$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " " . $plugin_event . " Event Trigger.";
-						$method .= PHP_EOL . $this->_t(2) . "\$results = \$dispatcher->trigger('" . $plugin_event . "', array('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $view['settings']->context . "', &\$this->item, &\$params, 0));";
+						$method .= PHP_EOL . $this->_t(2) . "\$results = \$dispatcher->trigger('" . $plugin_event . "', array('com_" . $this->componentCodeName . "." . $view['settings']->context . "', &\$this->item, &\$params, 0));";
 						$method .= PHP_EOL . $this->_t(2) . '$this->item->event->' . $plugin_event . ' = trim(implode("\n", $results));';
 					}
 				}
@@ -3612,7 +3612,7 @@ class Interpretation extends Fields
 						// add cpanel button TODO does not work well on site with permissions
 						if ($custom_button['target'] == 2 || $this->target === 'site')
 						{
-							$buttons[] = $this->_t(1) . $tab . $this->_t(1) . "if (\$this->user->authorise('" . $viewName . "." . $keyCode . "', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+							$buttons[] = $this->_t(1) . $tab . $this->_t(1) . "if (\$this->user->authorise('" . $viewName . "." . $keyCode . "', 'com_" . $this->componentCodeName . "'))";
 						}
 						else
 						{
@@ -3633,7 +3633,7 @@ class Interpretation extends Fields
 							{
 								$this->onlyFunctionButton[$viewsName] = array();
 							}
-							$this->onlyFunctionButton[$viewsName][] = $this->_t(1) . $tab . "if (\$this->user->authorise('" . $viewName . "." . $keyCode . "', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+							$this->onlyFunctionButton[$viewsName][] = $this->_t(1) . $tab . "if (\$this->user->authorise('" . $viewName . "." . $keyCode . "', 'com_" . $this->componentCodeName . "'))";
 							$this->onlyFunctionButton[$viewsName][] = $this->_t(1) . $tab . "{";
 							$this->onlyFunctionButton[$viewsName][] = $this->_t(1) . $tab . $this->_t(1) . "//" . $this->setLine(__LINE__) . " add " . $custom_button['name'] . " button.";
 							$this->onlyFunctionButton[$viewsName][] = $this->_t(1) . $tab . $this->_t(1) . "JToolBarHelper::custom('" . $viewsName . "." . $custom_button['method'] . "', '" . $custom_button['icomoon'] . "', '', '" . $keyLang . "', false);";
@@ -3641,7 +3641,7 @@ class Interpretation extends Fields
 						}
 						else
 						{
-							$buttons[] = $this->_t(1) . $tab . $this->_t(1) . "if (\$this->user->authorise('" . $viewName . "." . $keyCode . "', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+							$buttons[] = $this->_t(1) . $tab . $this->_t(1) . "if (\$this->user->authorise('" . $viewName . "." . $keyCode . "', 'com_" . $this->componentCodeName . "'))";
 							$buttons[] = $this->_t(1) . $tab . $this->_t(1) . "{";
 							$buttons[] = $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " add " . $custom_button['name'] . " button.";
 							$buttons[] = $this->_t(1) . $tab . $this->_t(2) . "JToolBarHelper::custom('" . $viewsName . "." . $custom_button['method'] . "', '" . $custom_button['icomoon'] . "', '', '" . $keyLang . "', '" . $validateSelection . "');";
@@ -3769,11 +3769,11 @@ class Interpretation extends Fields
 			// set path
 			if ('site' === $this->target)
 			{
-				$path = '/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/assets/js/' . $view['settings']->code . '.js';
+				$path = '/components/com_' . $this->componentCodeName . '/assets/js/' . $view['settings']->code . '.js';
 			}
 			else
 			{
-				$path = '/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/assets/js/' . $view['settings']->code . '.js';
+				$path = '/administrator/components/com_' . $this->componentCodeName . '/assets/js/' . $view['settings']->code . '.js';
 			}
 			// add script to file
 			$this->fileContentDynamic[$view['settings']->code][$this->hhh . $TARGET . '_JAVASCRIPT_FILE' . $this->hhh] = $this->setPlaceholders($view['settings']->javascript_file, $this->placeholders);
@@ -3929,7 +3929,7 @@ class Interpretation extends Fields
 			$chart[] = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " add the google chart builder class.";
 			$chart[] = $this->_t(2) . "require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';";
 			$chart[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " load the google chart js.";
-			$chart[] = $this->_t(2) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/js/google.jsapi.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$chart[] = $this->_t(2) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/js/google.jsapi.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			$chart[] = $this->_t(2) . "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			$chart[] = $this->_t(2) . "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			return implode(PHP_EOL, $chart);
@@ -3954,7 +3954,7 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $this->_t(2) . "require_once( JPATH_COMPONENT_ADMINISTRATOR.'/helpers/headercheck.php' );";
 		}
 		$setter .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Initialize the header checker.";
-		$setter .= PHP_EOL . $this->_t(2) . "\$HeaderCheck = new " . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "HeaderCheck;";
+		$setter .= PHP_EOL . $this->_t(2) . "\$HeaderCheck = new " . $this->componentCodeName . "HeaderCheck;";
 		// check if this view should get libraries
 		if (isset($this->libManager[$this->target][$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->libManager[$this->target][$view['settings']->code]))
 		{
@@ -4157,15 +4157,15 @@ class Interpretation extends Fields
 	{
 		if (strpos($root, '/media/') !== false && strpos($root, '/admin/') === false && strpos($root, '/site/') === false)
 		{
-			return str_replace('/media/', '/media/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/', $root);
+			return str_replace('/media/', '/media/com_' . $this->componentCodeName . '/', $root);
 		}
 		elseif (strpos($root, '/media/') === false && strpos($root, '/admin/') !== false && strpos($root, '/site/') === false)
 		{
-			return str_replace('/admin/', '/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/', $root);
+			return str_replace('/admin/', '/administrator/components/com_' . $this->componentCodeName . '/', $root);
 		}
 		elseif (strpos($root, '/media/') === false && strpos($root, '/admin/') === false && strpos($root, '/site/') !== false)
 		{
-			return str_replace('/site/', '/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/', $root);
+			return str_replace('/site/', '/components/com_' . $this->componentCodeName . '/', $root);
 		}
 		return $root;
 	}
@@ -4202,12 +4202,12 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine(__LINE__) . " The uikit css.";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
-			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/css/uikit'.\$style.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v2/css/uikit'.\$style.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine(__LINE__) . " The uikit js.";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
-			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/js/uikit'.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v2/js/uikit'.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
 		}
 		// load the components need
@@ -4252,16 +4252,16 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $tabV . $this->_t(4) . "foreach (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::\$uk_components[\$class] as \$name)";
 			$setter .= PHP_EOL . $tabV . $this->_t(4) . "{";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine(__LINE__) . " check if the CSS file exists.";
-			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
+			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->componentCodeName . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "{";
 			$setter .= PHP_EOL . $tabV . $this->_t(6) . "//" . $this->setLine(__LINE__) . " load the css.";
-			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine(__LINE__) . " check if the JavaScript file exists.";
-			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
+			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->componentCodeName . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "{";
 			$setter .= PHP_EOL . $tabV . $this->_t(6) . "//" . $this->setLine(__LINE__) . " load the js.";
-			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
+			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(4) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(3) . "}";
@@ -4281,16 +4281,16 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $tabV . $this->_t(4) . "foreach (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::\$uk_components[\$class] as \$name)";
 			$setter .= PHP_EOL . $tabV . $this->_t(4) . "{";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine(__LINE__) . " check if the CSS file exists.";
-			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
+			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->componentCodeName . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "{";
 			$setter .= PHP_EOL . $tabV . $this->_t(6) . "//" . $this->setLine(__LINE__) . " load the css.";
-			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine(__LINE__) . " check if the JavaScript file exists.";
-			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
+			$setter .= PHP_EOL . $tabV . $this->_t(5) . "if (JFile::exists(JPATH_ROOT.'/media/com_" . $this->componentCodeName . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "{";
 			$setter .= PHP_EOL . $tabV . $this->_t(6) . "//" . $this->setLine(__LINE__) . " load the js.";
-			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
+			$setter .= PHP_EOL . $tabV . $this->_t(6) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
 			$setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(4) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(3) . "}";
@@ -4310,12 +4310,12 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine(__LINE__) . " The uikit css.";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
-			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v3/css/uikit'.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v3/css/uikit'.\$size.'.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine(__LINE__) . " The uikit js.";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
-			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/uikit-v3/js/uikit'.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$setter .= PHP_EOL . $tabV . $this->_t(3) . "\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->componentCodeName . "/uikit-v3/js/uikit'.\$size.'.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			$setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
 			if (2 == $this->uikit)
 			{
@@ -4385,7 +4385,7 @@ class Interpretation extends Fields
 			{
 				case 1:
 					// top
-					return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '\'); ?>" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
+					return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '\'); ?>" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
 					break;
 				case 2:
 					// bottom
@@ -4656,7 +4656,7 @@ class Interpretation extends Fields
 		$script = '';
 		// get component name
 		$Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh];
-		$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+		$component = $this->componentCodeName;
 		// check if there was script added before modeling of data
 		$script .= $this->getCustomScriptBuilder('php_before_save', $view, PHP_EOL . PHP_EOL);
 		// turn array into JSON string
@@ -4746,7 +4746,7 @@ class Interpretation extends Fields
 		// reset
 		$oserver = "";
 		// set component name
-		$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+		$component = $this->componentCodeName;
 		// add the tags observer
 		if (isset($this->tagsBuilder[$view]) && ComponentbuilderHelper::checkString($this->tagsBuilder[$view]))
 		{
@@ -4779,7 +4779,7 @@ class Interpretation extends Fields
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
 			// set component name
-			$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+			$component = $this->componentCodeName;
 			// reset
 			$dbStuff = array();
 			// start loading the content type data
@@ -4866,7 +4866,7 @@ class Interpretation extends Fields
 		$script = $this->setComponentToContentTypes('install');
 
 		// set the component name
-		$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+		$component = $this->componentCodeName;
 
 		// add the assets table update for permissions rules
 		if (isset($this->assetsRules) && ComponentbuilderHelper::checkArray($this->assetsRules))
@@ -4941,7 +4941,7 @@ class Interpretation extends Fields
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
 			$script .= PHP_EOL . $this->_t(3) . 'echo \'<a target="_blank" href="' . $this->fileContentStatic[$this->hhh . 'AUTHORWEBSITE' . $this->hhh] . '" title="' . $this->fileContentStatic[$this->hhh . 'Component_name' . $this->hhh] . '">';
-			$script .= PHP_EOL . $this->_t(4) . '<img src="components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/assets/images/vdm-component.' . $this->componentImageType . '"/>';
+			$script .= PHP_EOL . $this->_t(4) . '<img src="components/com_' . $this->componentCodeName . '/assets/images/vdm-component.' . $this->componentImageType . '"/>';
 			$script .= PHP_EOL . $this->_t(4) . '</a>';
 			$script .= PHP_EOL . $this->_t(4) . "<h3>Upgrade to Version " . $this->fileContentStatic[$this->hhh . 'ACTUALVERSION' . $this->hhh] . " Was Successful! Let us know if anything is not working as expected.</h3>';";
 		}
@@ -4959,7 +4959,7 @@ class Interpretation extends Fields
 		$script = '';
 		if (isset($this->uninstallScriptBuilder) && ComponentbuilderHelper::checkArray($this->uninstallScriptBuilder))
 		{
-			$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+			$component = $this->componentCodeName;
 			// start loading the data to delet
 			$script .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get Application object";
 			$script .= PHP_EOL . $this->_t(2) . "\$app = JFactory::getApplication();";
@@ -5365,7 +5365,7 @@ class Interpretation extends Fields
 			$routeHelper[] = $this->_t(4) . "'" . $viewName_single . "'  => array((int) \$id)";
 			$routeHelper[] = $this->_t(3) . ");";
 			$routeHelper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Create the link";
-			$routeHelper[] = $this->_t(3) . "\$link = 'index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_single . "&id='. \$id;";
+			$routeHelper[] = $this->_t(3) . "\$link = 'index.php?option=com_" . $this->componentCodeName . "&view=" . $viewName_single . "&id='. \$id;";
 			$routeHelper[] = $this->_t(2) . "}";
 			$routeHelper[] = $this->_t(2) . "else";
 			$routeHelper[] = $this->_t(2) . "{";
@@ -5374,13 +5374,13 @@ class Interpretation extends Fields
 			$routeHelper[] = $this->_t(4) . "'" . $viewName_single . "'  => array()";
 			$routeHelper[] = $this->_t(3) . ");";
 			$routeHelper[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Create the link but don't add the id.";
-			$routeHelper[] = $this->_t(3) . "\$link = 'index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_single . "';";
+			$routeHelper[] = $this->_t(3) . "\$link = 'index.php?option=com_" . $this->componentCodeName . "&view=" . $viewName_single . "';";
 			$routeHelper[] = $this->_t(2) . "}";
 			if ('category' != $viewName_single && 'categories' != $viewName_single)
 			{
 				$routeHelper[] = $this->_t(2) . "if (\$catid > 1)";
 				$routeHelper[] = $this->_t(2) . "{";
-				$routeHelper[] = $this->_t(3) . "\$categories = JCategories::getInstance('" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $viewName_list . "');";
+				$routeHelper[] = $this->_t(3) . "\$categories = JCategories::getInstance('" . $this->componentCodeName . "." . $viewName_list . "');";
 				$routeHelper[] = $this->_t(3) . "\$category = \$categories->get(\$catid);";
 				$routeHelper[] = $this->_t(3) . "if (\$category)";
 				$routeHelper[] = $this->_t(3) . "{";
@@ -5443,7 +5443,7 @@ class Interpretation extends Fields
 						{
 							if (isset($get['selection']['table']))
 							{
-								$viewTable = str_replace('#__' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_', '', $get['selection']['table']);
+								$viewTable = str_replace('#__' . $this->componentCodeName . '_', '', $get['selection']['table']);
 							}
 						}
 						break;
@@ -6045,7 +6045,7 @@ class Interpretation extends Fields
 			$fixUniqe[] = $this->_t(4) . "{";
 			$fixUniqe[] = $this->_t(5) . "\$data['" . $alias . "'] = JFilterOutput::stringURLSafe(" . implode(' . " " . ', $titleData) . ");";
 			$fixUniqe[] = $this->_t(4) . "}";
-			$fixUniqe[] = PHP_EOL . $this->_t(4) . "\$table = JTable::getInstance('" . $viewName_single . "', '" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "Table');";
+			$fixUniqe[] = PHP_EOL . $this->_t(4) . "\$table = JTable::getInstance('" . $viewName_single . "', '" . $this->componentCodeName . "Table');";
 			if ($setCategory && count($titles) == 1)
 			{
 				$fixUniqe[] = PHP_EOL . $this->_t(4) . "if (\$table->load(array('" . $alias . "' => \$data['" . $alias . "'], '" . $category . "' => \$data['" . $category . "'])) && (\$table->id != \$data['id'] || \$data['id'] == 0))";
@@ -6240,7 +6240,7 @@ class Interpretation extends Fields
 		if (isset($this->queryBuilder) && ComponentbuilderHelper::checkArray($this->queryBuilder))
 		{
 			// set the main db prefix
-			$component = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+			$component = $this->componentCodeName;
 			// start building the db
 			$db = '';
 			foreach ($this->queryBuilder as $view => $fields)
@@ -7139,7 +7139,7 @@ class Interpretation extends Fields
 			foreach ($this->customAdminViewListLink[$viewName_list] as $customLinkView)
 			{
 				$customAdminViewButton .= PHP_EOL . $this->_t(3) . "<?php if (\$canDo->get('" . $customLinkView['link'] . ".access')): ?>";
-				$customAdminViewButton .= PHP_EOL . $this->_t(4) . '<a class="hasTooltip btn btn-mini" href="index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $customLinkView['link'] . '&id=<?php echo $item->id; ?>' . $ref . '" title="<?php echo JText:' . ':_(' . "'COM_" . $this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh] . '_' . $customLinkView['NAME'] . "'" . '); ?>" ><span class="icon-' . $customLinkView['icon'] . '"></span></a>';
+				$customAdminViewButton .= PHP_EOL . $this->_t(4) . '<a class="hasTooltip btn btn-mini" href="index.php?option=com_' . $this->componentCodeName . '&view=' . $customLinkView['link'] . '&id=<?php echo $item->id; ?>' . $ref . '" title="<?php echo JText:' . ':_(' . "'COM_" . $this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh] . '_' . $customLinkView['NAME'] . "'" . '); ?>" ><span class="icon-' . $customLinkView['icon'] . '"></span></a>';
 				$customAdminViewButton .= PHP_EOL . $this->_t(3) . "<?php else: ?>";
 				$customAdminViewButton .= PHP_EOL . $this->_t(4) . '<a class="hasTooltip btn btn-mini disabled" href="#" title="<?php echo JText:' . ':_(' . "'COM_" . $this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh] . '_' . $customLinkView['NAME'] . "'" . '); ?>"><span class="icon-' . $customLinkView['icon'] . '"></span></a>';
 				$customAdminViewButton .= PHP_EOL . $this->_t(3) . "<?php endif; ?>";
@@ -7237,7 +7237,7 @@ class Interpretation extends Fields
 			// get the other view
 			$otherViews = $this->catCodeBuilder[$viewName_single]['views'];
 			// return the link to category
-			return 'index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->' . $item['code'] . '; ?>&extension=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.' . $otherViews;
+			return 'index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->' . $item['code'] . '; ?>&extension=com_' . $this->componentCodeName . '.' . $otherViews;
 		}
 		elseif ($item['type'] === 'user' && !$item['title'])
 		{
@@ -7281,7 +7281,7 @@ class Interpretation extends Fields
 			// get the other view
 			$otherViews = $this->catCodeBuilder[$viewName_single]['views'];
 			// return the authority to category
-			return $user . "->authorise('core.edit', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $otherViews . ".category.' . (int)\$item->" . $item['code'] . ")";
+			return $user . "->authorise('core.edit', 'com_" . $this->componentCodeName . "." . $otherViews . ".category.' . (int)\$item->" . $item['code'] . ")";
 		}
 		elseif ($item['type'] === 'user' && !$item['title'])
 		{
@@ -7300,10 +7300,10 @@ class Interpretation extends Fields
 			// check if the item has permissions.
 			if ($coreLoadLink && (isset($coreLink['core.edit']) && isset($this->permissionBuilder[$coreLink['core.edit']])) && ComponentbuilderHelper::checkArray($this->permissionBuilder[$coreLink['core.edit']]) && in_array($item['custom']['view'], $this->permissionBuilder[$coreLink['core.edit']]))
 			{
-				return $user . "->authorise('" . $coreLink['core.edit'] . "', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $item['custom']['view'] . ".' . (int)\$item->" . $item['id_code'] . ")";
+				return $user . "->authorise('" . $coreLink['core.edit'] . "', 'com_" . $this->componentCodeName . "." . $item['custom']['view'] . ".' . (int)\$item->" . $item['id_code'] . ")";
 			}
 			// return default for this external item
-			return $user . "->authorise('core.edit', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $item['custom']['view'] . ".' . (int)\$item->" . $item['id_code'] . ")";
+			return $user . "->authorise('core.edit', 'com_" . $this->componentCodeName . "." . $item['custom']['view'] . ".' . (int)\$item->" . $item['id_code'] . ")";
 		}
 		elseif (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']) && $item['custom']['extends'] === 'user' && !$item['title'] && isset($item['id_code']))
 		{
@@ -8187,7 +8187,7 @@ class Interpretation extends Fields
 			$fadein[] = $this->_t(1) . "// waiting spinner";
 			$fadein[] = $this->_t(1) . "var outerDiv = jQuery('body');";
 			$fadein[] = $this->_t(1) . "jQuery('<div id=\"loading\"></div>')";
-			$fadein[] = $this->_t(2) . ".css(\"background\", \"rgba(255, 255, 255, .8) url('components/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/assets/images/import.gif') 50% 15% no-repeat\")";
+			$fadein[] = $this->_t(2) . ".css(\"background\", \"rgba(255, 255, 255, .8) url('components/com_" . $this->componentCodeName . "/assets/images/import.gif') 50% 15% no-repeat\")";
 			$fadein[] = $this->_t(2) . ".css(\"top\", outerDiv.position().top - jQuery(window).scrollTop())";
 			$fadein[] = $this->_t(2) . ".css(\"left\", outerDiv.position().left - jQuery(window).scrollLeft())";
 			$fadein[] = $this->_t(2) . ".css(\"width\", outerDiv.width())";
@@ -8201,15 +8201,15 @@ class Interpretation extends Fields
 			$fadein[] = $this->_t(1) . "jQuery('#loading').show();";
 			$fadein[] = $this->_t(1) . "// when page is ready remove and show";
 			$fadein[] = $this->_t(1) . "jQuery(window).load(function() {";
-			$fadein[] = $this->_t(2) . "jQuery('#" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_loader').fadeIn('fast');";
+			$fadein[] = $this->_t(2) . "jQuery('#" . $this->componentCodeName . "_loader').fadeIn('fast');";
 			$fadein[] = $this->_t(2) . "jQuery('#loading').hide();";
 			$fadein[] = $this->_t(1) . "});";
 			$fadein[] = "</script>";
-			$fadein[] = "<div id=\"" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_loader\" style=\"display: none;\">";
+			$fadein[] = "<div id=\"" . $this->componentCodeName . "_loader\" style=\"display: none;\">";
 
 			return implode(PHP_EOL, $fadein);
 		}
-		return "<div id=\"" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_loader\">";
+		return "<div id=\"" . $this->componentCodeName . "_loader\">";
 	}
 
 	/**
@@ -8276,9 +8276,9 @@ class Interpretation extends Fields
 			$this->fileContentDynamic[$view_name_single . '_' . $layoutCodeName][$this->hhh . 'LAYOUTITEMSTABLE' . $this->hhh] = $head . $body;
 			// LAYOUTITEMSHEADER <<<DYNAMIC>>>
 			$headerscript = '//' . $this->setLine(__LINE__) . ' set the edit URL';
-			$headerscript .= PHP_EOL . '$edit = "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $list . '&task=' . $single . '.edit";';
+			$headerscript .= PHP_EOL . '$edit = "index.php?option=com_' . $this->componentCodeName . '&view=' . $list . '&task=' . $single . '.edit";';
 			$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' set a return value';
-			$headerscript .= PHP_EOL . '$return = ($id) ? "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $view_name_single . '&layout=edit&id=" . $id : "";';
+			$headerscript .= PHP_EOL . '$return = ($id) ? "index.php?option=com_' . $this->componentCodeName . '&view=' . $view_name_single . '&layout=edit&id=" . $id : "";';
 			$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' check for a return value';
 			$headerscript .= PHP_EOL . '$jinput = JFactory::getApplication()->input;';
 			$headerscript .= PHP_EOL . "if (\$_return = \$jinput->get('return', null, 'base64'))";
@@ -8301,13 +8301,13 @@ class Interpretation extends Fields
 				if ($addNewButon == 1 || $addNewButon == 2)
 				{
 					$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' set the create new URL';
-					$headerscript .= PHP_EOL . '$new = "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $list . '&task=' . $single . '.edit" . $ref;';
+					$headerscript .= PHP_EOL . '$new = "index.php?option=com_' . $this->componentCodeName . '&view=' . $list . '&task=' . $single . '.edit" . $ref;';
 				}
 				// and the link for close and new
 				if ($addNewButon == 2 || $addNewButon == 3)
 				{
 					$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' set the create new and close URL';
-					$headerscript .= PHP_EOL . '$close_new = "index.php?option=com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '&view=' . $list . '&task=' . $single . '.edit";';
+					$headerscript .= PHP_EOL . '$close_new = "index.php?option=com_' . $this->componentCodeName . '&view=' . $list . '&task=' . $single . '.edit";';
 				}
 				$headerscript .= PHP_EOL . '//' . $this->setLine(__LINE__) . ' load the action object';
 				$headerscript .= PHP_EOL . '$can = ' . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . 'Helper::getActions(' . "'" . $single . "'" . ');';
@@ -8378,22 +8378,22 @@ class Interpretation extends Fields
 		if (!isset($this->footableVersion) || 2 == $this->footableVersion) // loading version 2
 		{
 			$foo = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Add the CSS for Footable.";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/css/footable.core.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/css/footable.core.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Use the Metro Style";
 			$foo .= PHP_EOL . $this->_t(2) . "if (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)";
 			$foo .= PHP_EOL . $this->_t(2) . "{";
-			$foo .= PHP_EOL . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/css/footable.metro.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$foo .= PHP_EOL . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/css/footable.metro.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . $this->_t(2) . "}";
 			$foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Use the Legacy Style.";
 			$foo .= PHP_EOL . $this->_t(2) . "elseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)";
 			$foo .= PHP_EOL . $this->_t(2) . "{";
-			$foo .= PHP_EOL . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/css/footable.standalone.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$foo .= PHP_EOL . $this->_t(3) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/css/footable.standalone.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . $this->_t(2) . "}";
 			$foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/js/footable.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/js/footable.sort.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/js/footable.filter.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v2/js/footable.paginate.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.sort.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.filter.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v2/js/footable.paginate.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			if ($init)
 			{
 				$foo .= PHP_EOL . PHP_EOL . $this->_t(2) . '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery(' . "'.footable'" . ').footable(); }); jQuery(' . "'.nav-tabs'" . ').on(' . "'click'" . ', ' . "'li'" . ', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery(' . "'.footable'" . ').trigger(' . "'footable_resize'" . '); }";';
@@ -8405,9 +8405,9 @@ class Interpretation extends Fields
 
 			$foo = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Add the CSS for Footable";
 			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v3/css/footable.standalone.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v3/css/footable.standalone.min.css', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable (adding all funtions)";
-			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "/footable-v3/js/footable.min.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . $this->_t(2) . "\$this->document->addScript(JURI::root() .'media/com_" . $this->componentCodeName . "/footable-v3/js/footable.min.js', (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			if ($init)
 			{
 				$foo .= PHP_EOL . PHP_EOL . $this->_t(2) . '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery(' . "'.footable'" . ').footable();});});";';
@@ -8741,8 +8741,8 @@ class Interpretation extends Fields
 		{
 			$query .= PHP_EOL . $this->_t(2) . "\$query->select(\$db->quoteName('c.title','category_title'));";
 		}
-		$query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " From the " . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_" . $viewName_single . " table";
-		$query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_" . $viewName_single . "', 'a'));";
+		$query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " From the " . $this->componentCodeName . "_" . $viewName_single . " table";
+		$query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__" . $this->componentCodeName . "_" . $viewName_single . "', 'a'));";
 		// add the category
 		if ($addCategory)
 		{
@@ -8824,7 +8824,7 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . $this->_t(3) . "\$query->where('a.access = ' . (int) \$access);";
 			$query .= PHP_EOL . $this->_t(2) . "}";
 			$query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Implement View Level Access";
-			$query .= PHP_EOL . $this->_t(2) . "if (!\$user->authorise('core.options', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+			$query .= PHP_EOL . $this->_t(2) . "if (!\$user->authorise('core.options', 'com_" . $this->componentCodeName . "'))";
 			$query .= PHP_EOL . $this->_t(2) . "{";
 			$query .= PHP_EOL . $this->_t(3) . "\$groups = implode(',', \$user->getAuthorisedViewLevels());";
 			$query .= PHP_EOL . $this->_t(3) . "\$query->where('a.access IN (' . \$groups . ')');";
@@ -9054,7 +9054,7 @@ class Interpretation extends Fields
 				$method[] = $this->_t(2) . "JSession::checkToken() or die(JText:" . ":_('JINVALID_TOKEN'));";
 				$method[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if export is allowed for this user.";
 				$method[] = $this->_t(2) . "\$user = JFactory::getUser();";
-				$method[] = $this->_t(2) . "if (\$user->authorise('" . $custom_button['link'] . ".access', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+				$method[] = $this->_t(2) . "if (\$user->authorise('" . $custom_button['link'] . ".access', 'com_" . $this->componentCodeName . "'))";
 				$method[] = $this->_t(2) . "{";
 				$method[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the input";
 				$method[] = $this->_t(3) . "\$input = JFactory::getApplication()->input;";
@@ -9063,12 +9063,12 @@ class Interpretation extends Fields
 				$method[] = $this->_t(3) . "JArrayHelper::toInteger(\$pks);";
 				$method[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " convert to string";
 				$method[] = $this->_t(3) . "\$ids = implode('_', \$pks);";
-				$method[] = $this->_t(3) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $custom_button['link'] . "&cid='.\$ids, false));";
+				$method[] = $this->_t(3) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=" . $custom_button['link'] . "&cid='.\$ids, false));";
 				$method[] = $this->_t(3) . "return;";
 				$method[] = $this->_t(2) . "}";
 				$method[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Redirect to the list screen with error.";
 				$method[] = $this->_t(2) . "\$message = JText:" . ":_('" . $this->langPrefix . "_ACCESS_TO_" . $custom_button['NAME'] . "_FAILED');";
-				$method[] = $this->_t(2) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_list . "', false), \$message, 'error');";
+				$method[] = $this->_t(2) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=" . $viewName_list . "', false), \$message, 'error');";
 				$method[] = $this->_t(2) . "return;";
 				$method[] = $this->_t(1) . "}";
 				// add to lang array
@@ -9113,8 +9113,8 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . $this->_t(3) . "\$query = \$db->getQuery(true);";
 			$query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Select some fields";
 			$query .= PHP_EOL . $this->_t(3) . "\$query->select('a.*');";
-			$query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " From the " . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_" . $viewName_single . " table";
-			$query .= PHP_EOL . $this->_t(3) . "\$query->from(\$db->quoteName('#__" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_" . $viewName_single . "', 'a'));";
+			$query .= PHP_EOL . PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " From the " . $this->componentCodeName . "_" . $viewName_single . " table";
+			$query .= PHP_EOL . $this->_t(3) . "\$query->from(\$db->quoteName('#__" . $this->componentCodeName . "_" . $viewName_single . "', 'a'));";
 			$query .= PHP_EOL . $this->_t(3) . "\$query->where('a.id IN (' . implode(',',\$pks) . ')');";
 			// add custom filtering php
 			$query .= $this->getCustomScriptBuilder('php_getlistquery', $viewName_single, PHP_EOL . PHP_EOL . $this->_t(1));
@@ -9122,7 +9122,7 @@ class Interpretation extends Fields
 			if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
 			{
 				$query .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Implement View Level Access";
-				$query .= PHP_EOL . $this->_t(3) . "if (!\$user->authorise('core.options', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+				$query .= PHP_EOL . $this->_t(3) . "if (!\$user->authorise('core.options', 'com_" . $this->componentCodeName . "'))";
 				$query .= PHP_EOL . $this->_t(3) . "{";
 				$query .= PHP_EOL . $this->_t(4) . "\$groups = implode(',', \$user->getAuthorisedViewLevels());";
 				$query .= PHP_EOL . $this->_t(4) . "\$query->where('a.access IN (' . \$groups . ')');";
@@ -9170,7 +9170,7 @@ class Interpretation extends Fields
 			$method[] = $this->_t(2) . "JSession::checkToken() or die(JText:" . ":_('JINVALID_TOKEN'));";
 			$method[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if export is allowed for this user.";
 			$method[] = $this->_t(2) . "\$user = JFactory::getUser();";
-			$method[] = $this->_t(2) . "if (\$user->authorise('" . $viewName_single . ".export', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "') && \$user->authorise('core.export', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+			$method[] = $this->_t(2) . "if (\$user->authorise('" . $viewName_single . ".export', 'com_" . $this->componentCodeName . "') && \$user->authorise('core.export', 'com_" . $this->componentCodeName . "'))";
 			$method[] = $this->_t(2) . "{";
 			$method[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the input";
 			$method[] = $this->_t(3) . "\$input = JFactory::getApplication()->input;";
@@ -9190,7 +9190,7 @@ class Interpretation extends Fields
 			$method[] = $this->_t(2) . "}";
 			$method[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Redirect to the list screen with error.";
 			$method[] = $this->_t(2) . "\$message = JText:" . ":_('" . $this->langPrefix . "_EXPORT_FAILED');";
-			$method[] = $this->_t(2) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_list . "', false), \$message, 'error');";
+			$method[] = $this->_t(2) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=" . $viewName_list . "', false), \$message, 'error');";
 			$method[] = $this->_t(2) . "return;";
 			$method[] = $this->_t(1) . "}";
 
@@ -9201,7 +9201,7 @@ class Interpretation extends Fields
 			$method[] = $this->_t(2) . "JSession::checkToken() or die(JText:" . ":_('JINVALID_TOKEN'));";
 			$method[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " check if import is allowed for this user.";
 			$method[] = $this->_t(2) . "\$user = JFactory::getUser();";
-			$method[] = $this->_t(2) . "if (\$user->authorise('" . $viewName_single . ".import', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "') && \$user->authorise('core.import', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+			$method[] = $this->_t(2) . "if (\$user->authorise('" . $viewName_single . ".import', 'com_" . $this->componentCodeName . "') && \$user->authorise('core.import', 'com_" . $this->componentCodeName . "'))";
 			$method[] = $this->_t(2) . "{";
 			$method[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Get the import model";
 			$method[] = $this->_t(3) . "\$model = \$this->getModel('" . ComponentbuilderHelper::safeString($viewName_list, 'F') . "');";
@@ -9226,18 +9226,18 @@ class Interpretation extends Fields
 			// if this view has custom script it must have as custom import (model, veiw, controller)
 			if (isset($this->importCustomScripts[$viewName_list]) && $this->importCustomScripts[$viewName_list])
 			{
-				$method[] = $this->_t(4) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=import_" . $viewName_list . "', false), \$message);";
+				$method[] = $this->_t(4) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=import_" . $viewName_list . "', false), \$message);";
 			}
 			else
 			{
-				$method[] = $this->_t(4) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=import', false), \$message);";
+				$method[] = $this->_t(4) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=import', false), \$message);";
 			}
 			$method[] = $this->_t(4) . "return;";
 			$method[] = $this->_t(3) . "}";
 			$method[] = $this->_t(2) . "}";
 			$method[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Redirect to the list screen with error.";
 			$method[] = $this->_t(2) . "\$message = JText:" . ":_('" . $this->langPrefix . "_IMPORT_FAILED');";
-			$method[] = $this->_t(2) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "&view=" . $viewName_list . "', false), \$message, 'error');";
+			$method[] = $this->_t(2) . "\$this->setRedirect(JRoute::_('index.php?option=com_" . $this->componentCodeName . "&view=" . $viewName_list . "', false), \$message, 'error');";
 			$method[] = $this->_t(2) . "return;";
 			$method[] = $this->_t(1) . "}";
 			return implode(PHP_EOL, $method);
@@ -9342,8 +9342,8 @@ class Interpretation extends Fields
 		{
 			$query .= PHP_EOL . $this->_t(2) . "\$query->select(\$db->quoteName('c.title','category_title'));";
 		}
-		$query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " From the " . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_item table";
-		$query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "_" . $viewName_single . "', 'a'));";
+		$query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " From the " . $this->componentCodeName . "_item table";
+		$query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__" . $this->componentCodeName . "_" . $viewName_single . "', 'a'));";
 		// add the category
 		if ($addCategory)
 		{
@@ -9374,7 +9374,7 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . $this->_t(3) . "\$query->where('a.access = ' . (int) \$access);";
 			$query .= PHP_EOL . $this->_t(2) . "}";
 			$query .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Implement View Level Access";
-			$query .= PHP_EOL . $this->_t(2) . "if (!\$user->authorise('core.options', 'com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "'))";
+			$query .= PHP_EOL . $this->_t(2) . "if (!\$user->authorise('core.options', 'com_" . $this->componentCodeName . "'))";
 			$query .= PHP_EOL . $this->_t(2) . "{";
 			$query .= PHP_EOL . $this->_t(3) . "\$groups = implode(',', \$user->getAuthorisedViewLevels());";
 			$query .= PHP_EOL . $this->_t(3) . "\$query->where('a.access IN (' . \$groups . ')');";
@@ -9883,7 +9883,7 @@ class Interpretation extends Fields
 			$_config = array($this->hhh . 'CREATIONDATE' . $this->hhh => $_created, $this->hhh . 'BUILDDATE' . $this->hhh => $_modified, $this->hhh . 'VERSION' . $this->hhh => $viewArray['settings']->version);
 			$this->buildDynamique($_target, 'javascript_file', false, $_config);
 			// set path
-			$_path = '/administrator/components/com_' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '/assets/js/' . $viewName_list . '.js';
+			$_path = '/administrator/components/com_' . $this->componentCodeName . '/assets/js/' . $viewName_list . '.js';
 			// load the file to the list view
 			$this->fileContentDynamic[$viewName_list][$this->hhh . 'ADMIN_ADD_JAVASCRIPT_FILE' . $this->hhh] = PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Add List View JavaScript File" . PHP_EOL . $this->_t(2) . $this->setIncludeLibScript($_path);
 		}
@@ -12374,7 +12374,7 @@ class Interpretation extends Fields
 					$toolBar .= PHP_EOL . $this->_t(4) . "\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('" . $core['core.version'] . "'));";
 					$toolBar .= PHP_EOL . $this->_t(4) . "if (\$this->state->params->get('save_history', 1) && \$this->canDo->get('" . $core['core.edit'] . "') && \$canVersion)";
 					$toolBar .= PHP_EOL . $this->_t(4) . "{";
-					$toolBar .= PHP_EOL . $this->_t(5) . "JToolbarHelper::versions('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $viewName . "', \$this->item->id);";
+					$toolBar .= PHP_EOL . $this->_t(5) . "JToolbarHelper::versions('com_" . $this->componentCodeName . "." . $viewName . "', \$this->item->id);";
 					$toolBar .= PHP_EOL . $this->_t(4) . "}";
 				}
 			}
@@ -12385,7 +12385,7 @@ class Interpretation extends Fields
 					$toolBar .= PHP_EOL . $this->_t(4) . "\$canVersion = (\$this->canDo->get('core.version') && \$this->canDo->get('" . $core['core.version'] . "'));";
 					$toolBar .= PHP_EOL . $this->_t(4) . "if (\$this->state->params->get('save_history', 1) && \$this->canDo->get('core.edit') && \$canVersion)";
 					$toolBar .= PHP_EOL . $this->_t(4) . "{";
-					$toolBar .= PHP_EOL . $this->_t(5) . "JToolbarHelper::versions('com_" . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . "." . $viewName . "', \$this->item->id);";
+					$toolBar .= PHP_EOL . $this->_t(5) . "JToolbarHelper::versions('com_" . $this->componentCodeName . "." . $viewName . "', \$this->item->id);";
 					$toolBar .= PHP_EOL . $this->_t(4) . "}";
 				}
 			}
@@ -12847,9 +12847,9 @@ class Interpretation extends Fields
 							if (isset($item['custom']['table']))
 							{
 								// check if this is a local table
-								if (strpos($item['custom']['table'], '#__' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_') !== false)
+								if (strpos($item['custom']['table'], '#__' . $this->componentCodeName . '_') !== false)
 								{
-									$keyTableNAme = str_replace('#__' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_', '', $item['custom']['table']);
+									$keyTableNAme = str_replace('#__' . $this->componentCodeName . '_', '', $item['custom']['table']);
 								}
 								else
 								{
@@ -13365,14 +13365,14 @@ class Interpretation extends Fields
 					$display[] = $tab . $this->_t(2) . "<?php  echo JHtml::_('bootstrap.endSlide'); ?>";
 					$slidecounter++;
 					// build the template file
-					$target = array('custom_admin' => $this->fileContentStatic[$this->hhh . 'component' . $this->hhh]);
+					$target = array('custom_admin' => $this->componentCodeName);
 					$this->buildDynamique($target, 'template', $tempName);
 					// set the file data
 					$TARGET = ComponentbuilderHelper::safeString($this->target, 'U');
 					// SITE_TEMPLATE_BODY <<<DYNAMIC>>>
-					$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_' . $tempName][$this->hhh . 'CUSTOM_ADMIN_TEMPLATE_BODY' . $this->hhh] = PHP_EOL . $html;
+					$this->fileContentDynamic[$this->componentCodeName . '_' . $tempName][$this->hhh . 'CUSTOM_ADMIN_TEMPLATE_BODY' . $this->hhh] = PHP_EOL . $html;
 					// SITE_TEMPLATE_CODE_BODY <<<DYNAMIC>>>
-					$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '_' . $tempName][$this->hhh . 'CUSTOM_ADMIN_TEMPLATE_CODE_BODY' . $this->hhh] = '';
+					$this->fileContentDynamic[$this->componentCodeName . '_' . $tempName][$this->hhh . 'CUSTOM_ADMIN_TEMPLATE_CODE_BODY' . $this->hhh] = '';
 				}
 				$display[] = $tab . $this->_t(1) . "<?php  echo JHtml::_('bootstrap.endAccordion'); ?>";
 				$display[] = $tab . "</div>";
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index faee0ef9b..2ef43f93a 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -270,7 +270,7 @@ class Infusion extends Interpretation
 					$this->setLockLicensePer($viewName_list, $this->target);
 
 					// FIELDSETS <<<DYNAMIC>>>
-					$this->fileContentDynamic[$viewName_single][$this->hhh . 'FIELDSETS' . $this->hhh] = $this->setFieldSet($view, $this->fileContentStatic[$this->hhh . 'component' . $this->hhh], $viewName_single, $viewName_list);
+					$this->fileContentDynamic[$viewName_single][$this->hhh . 'FIELDSETS' . $this->hhh] = $this->setFieldSet($view, $this->componentCodeName, $viewName_single, $viewName_list);
 
 					// ACCESSCONTROL <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single][$this->hhh . 'ACCESSCONTROL' . $this->hhh] = $this->setFieldSetAccessControl($viewName_single);
@@ -396,7 +396,7 @@ class Infusion extends Interpretation
 					if (isset($view['checkin']) && $view['checkin'] == 1)
 					{
 						// AUTOCHECKIN <<<DYNAMIC>>>
-						$this->fileContentDynamic[$viewName_list][$this->hhh . 'AUTOCHECKIN' . $this->hhh] = $this->setAutoCheckin($viewName_single, $this->fileContentStatic[$this->hhh . 'component' . $this->hhh]);
+						$this->fileContentDynamic[$viewName_list][$this->hhh . 'AUTOCHECKIN' . $this->hhh] = $this->setAutoCheckin($viewName_single, $this->componentCodeName);
 						// CHECKINCALL <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_list][$this->hhh . 'CHECKINCALL' . $this->hhh] = $this->setCheckinCall();
 					}
@@ -720,22 +720,22 @@ class Infusion extends Interpretation
 			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
 			{
 				// DASHBOARDVIEW
-				$this->fileContentStatic[$this->hhh . 'DASHBOARDVIEW' . $this->hhh] = $this->fileContentStatic[$this->hhh . 'component' . $this->hhh];
+				$this->fileContentStatic[$this->hhh . 'DASHBOARDVIEW' . $this->hhh] = $this->componentCodeName;
 
 				// DASHBOARDICONS
-				$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh]][$this->hhh . 'DASHBOARDICONS' . $this->hhh] = $this->setDashboardIcons();
+				$this->fileContentDynamic[$this->componentCodeName][$this->hhh . 'DASHBOARDICONS' . $this->hhh] = $this->setDashboardIcons();
 
 				// DASHBOARDICONACCESS
-				$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh]][$this->hhh . 'DASHBOARDICONACCESS' . $this->hhh] = $this->setDashboardIconAccess();
+				$this->fileContentDynamic[$this->componentCodeName][$this->hhh . 'DASHBOARDICONACCESS' . $this->hhh] = $this->setDashboardIconAccess();
 
 				// DASH_MODEL_METHODS
-				$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh]][$this->hhh . 'DASH_MODEL_METHODS' . $this->hhh] = $this->setDashboardModelMethods();
+				$this->fileContentDynamic[$this->componentCodeName][$this->hhh . 'DASH_MODEL_METHODS' . $this->hhh] = $this->setDashboardModelMethods();
 
 				// DASH_GET_CUSTOM_DATA
-				$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh]][$this->hhh . 'DASH_GET_CUSTOM_DATA' . $this->hhh] = $this->setDashboardGetCustomData();
+				$this->fileContentDynamic[$this->componentCodeName][$this->hhh . 'DASH_GET_CUSTOM_DATA' . $this->hhh] = $this->setDashboardGetCustomData();
 
 				// DASH_DISPLAY_DATA
-				$this->fileContentDynamic[$this->fileContentStatic[$this->hhh . 'component' . $this->hhh]][$this->hhh . 'DASH_DISPLAY_DATA' . $this->hhh] = $this->setDashboardDisplayData();
+				$this->fileContentDynamic[$this->componentCodeName][$this->hhh . 'DASH_DISPLAY_DATA' . $this->hhh] = $this->setDashboardDisplayData();
 			}
 			else
 			{
@@ -1223,7 +1223,7 @@ class Infusion extends Interpretation
 					$replace[$this->hhh . 'SITE_LANGUAGES' . $this->hhh] = implode(PHP_EOL . $this->_t(2), $langXML['site']);
 				}
 				// build xml path
-				$xmlPath = $this->componentPath . '/' . $this->fileContentStatic[$this->hhh . 'component' . $this->hhh] . '.xml';
+				$xmlPath = $this->componentPath . '/' . $this->componentCodeName . '.xml';
 				// get the content in xml
 				$componentXML = ComponentbuilderHelper::getFileContents($xmlPath);
 				// update the xml content
diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php
index 06c94d826..9404fd994 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -38,15 +38,15 @@ class JFormFieldComponent extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldComponent extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create joomla_component
 			if ($user->authorise('joomla_component.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=joomla_component&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit joomla_component
-			if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('joomla_component.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('joomla_component.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php
index 467b2d143..49198710e 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -38,15 +38,15 @@ class JFormFieldDynamicget extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldDynamicget extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create dynamic_get
 			if ($user->authorise('dynamic_get.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=dynamic_get&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit dynamic_get
-			if (($buttonName === 'dynamic_get' || $buttonName === 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php
index 61e7d0ae6..97290a607 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -38,15 +38,15 @@ class JFormFieldFieldtypes extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldFieldtypes extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create fieldtype
 			if ($user->authorise('fieldtype.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=fieldtype&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit fieldtype
-			if (($buttonName === 'fieldtype' || $buttonName === 'fieldtypes') && $user->authorise('fieldtype.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('fieldtype.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/libraries.php b/admin/models/fields/libraries.php
index 48e979f9a..b3548346c 100644
--- a/admin/models/fields/libraries.php
+++ b/admin/models/fields/libraries.php
@@ -38,15 +38,15 @@ class JFormFieldLibraries extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldLibraries extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create library
 			if ($user->authorise('library.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=library&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit library
-			if (($buttonName === 'library' || $buttonName === 'libraries') && $user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=libraries&task=library.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/librariesx.php b/admin/models/fields/librariesx.php
index 4846fa031..963cf17d0 100644
--- a/admin/models/fields/librariesx.php
+++ b/admin/models/fields/librariesx.php
@@ -38,15 +38,15 @@ class JFormFieldLibrariesx extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldLibrariesx extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create library
 			if ($user->authorise('library.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=library&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit library
-			if (($buttonName === 'library' || $buttonName === 'libraries') && $user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=libraries&task=library.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/library.php b/admin/models/fields/library.php
index 98d37479b..98ae99b44 100644
--- a/admin/models/fields/library.php
+++ b/admin/models/fields/library.php
@@ -38,15 +38,15 @@ class JFormFieldLibrary extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldLibrary extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create library
 			if ($user->authorise('library.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=library&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit library
-			if (($buttonName === 'library' || $buttonName === 'libraries') && $user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('library.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=libraries&task=library.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php
index fd4dbedb8..bdf871525 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -38,15 +38,15 @@ class JFormFieldMaingets extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldMaingets extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create dynamic_get
 			if ($user->authorise('dynamic_get.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=dynamic_get&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit dynamic_get
-			if (($buttonName === 'dynamic_get' || $buttonName === 'dynamic_gets') && $user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('dynamic_get.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_get.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/servers.php b/admin/models/fields/servers.php
index 4b919abb3..8e565392d 100644
--- a/admin/models/fields/servers.php
+++ b/admin/models/fields/servers.php
@@ -38,15 +38,15 @@ class JFormFieldServers extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldServers extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create server
 			if ($user->authorise('server.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=server&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit server
-			if (($buttonName === 'server' || $buttonName === 'servers') && $user->authorise('server.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('server.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=servers&task=server.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php
index 9ca601511..d5c46f2fb 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -38,15 +38,15 @@ class JFormFieldSnippets extends JFormFieldList
 	protected function getInput()
 	{
 		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
+		$set_button = $this->getAttribute('button');
 		// get html
 		$html = parent::getInput();
 		// if true set button
-		if ($setButton === 'true')
+		if ($set_button === 'true')
 		{
 			$button = array();
 			$script = array();
-			$buttonName = $this->getAttribute('name');
+			$button_code_name = $this->getAttribute('name');
 			// get the input from url
 			$app = JFactory::getApplication();
 			$jinput = $app->input;
@@ -70,55 +70,52 @@ class JFormFieldSnippets extends JFormFieldList
 				$ref .= '&amp;return=' . $_return;
 				$refJ .= '&return=' . $_return;
 			}
+			// get button label
+			$button_label = trim($button_code_name);
+			$button_label = preg_replace('/_+/', ' ', $button_label);
+			$button_label = preg_replace('/\s+/', ' ', $button_label);
+			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
+			$button_label = ucfirst(strtolower($button_label));
+			// get user object
 			$user = JFactory::getUser();
 			// only add if user allowed to create snippet
 			if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
 					href="index.php?option=com_componentbuilder&amp;view=snippet&amp;layout=edit'.$ref.'" >
 					<span class="icon-new icon-white"></span></a>';
 			}
 			// only add if user allowed to edit snippet
-			if (($buttonName === 'snippet' || $buttonName === 'snippets')  && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			if ($user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
 			{
 				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $button_label).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
 					<span class="icon-edit"></span></a>';
 				// build script
 				$script[] = "
 					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+						jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) {
 							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
+							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+							".$button_code_name."Button(".$button_code_name."Value);
 						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
+						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
+						".$button_code_name."Button(".$button_code_name."Value);
 					});
-					function ".$buttonName."Button(value) {
+					function ".$button_code_name."Button(value) {
 						if (value > 0) {
 							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
+							jQuery('#".$button_code_name."Create').hide();
 							// show edit button
-							jQuery('#".$buttonName."Edit').show();
+							jQuery('#".$button_code_name."Edit').show();
 							var url = 'index.php?option=com_componentbuilder&view=snippets&task=snippet.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
+							jQuery('#".$button_code_name."Edit').attr('href', url);
 						} else {
 							// show the create button
-							jQuery('#".$buttonName."Create').show();
+							jQuery('#".$button_code_name."Create').show();
 							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
+							jQuery('#".$button_code_name."Edit').hide();
 						}
 					}";
 			}
-- 
2.40.1


From 8acbb3b3a414f356e4dcb95958fdf75c0cedac16 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Tue, 18 Jun 2019 00:00:41 +0200
Subject: [PATCH 18/26] Fixed gh-422 to insure the details tab always gets
 added if no custom tab names are found. Added the option to run the expantion
 option without installing the components locally.

---
 README.md                                     |  6 +++---
 admin/README.txt                              |  6 +++---
 .../joomla_3/JControllerForm_site.php         |  6 +++---
 admin/config.xml                              | 15 ++++++++++++++
 .../en-GB/en-GB.com_componentbuilder.ini      |  4 ++++
 admin/models/fields/viewtabs.php              | 17 ++++++++++------
 componentbuilder.xml                          |  2 +-
 .../en-GB/en-GB.com_componentbuilder.ini      |  2 ++
 site/models/api.php                           | 20 ++++++++++++++++++-
 9 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 8f374c176..c742a1cee 100644
--- a/README.md
+++ b/README.md
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 13th June, 2019
++ *Last Build*: 17th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206816**
-+ *Field count*: **1140**
++ *Line count*: **206865**
++ *Field count*: **1141**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/README.txt b/admin/README.txt
index 8f374c176..c742a1cee 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 13th June, 2019
++ *Last Build*: 17th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206816**
-+ *Field count*: **1140**
++ *Line count*: **206865**
++ *Field count*: **1141**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/compiler/joomla_3/JControllerForm_site.php b/admin/compiler/joomla_3/JControllerForm_site.php
index 01a76de19..5ccd4c362 100644
--- a/admin/compiler/joomla_3/JControllerForm_site.php
+++ b/admin/compiler/joomla_3/JControllerForm_site.php
@@ -42,7 +42,7 @@ class ###Component###Controller###View### extends JControllerForm
 	{
 		$this->view_list = '###SITE_DEFAULT_VIEW###'; // safeguard for setting the return view listing to the default site view.
 		parent::__construct($config);
-	}
+	}###ADMIN_CUSTOM_BUTTONS_CONTROLLER###
 
         /**
 	 * Method override to check if you can add a new record.
@@ -141,7 +141,7 @@ class ###Component###Controller###View### extends JControllerForm
 		$this->refid = $this->input->get('refid', 0, 'int');
 
 		// Check if there is a return value
-		$return = $this->input->get('return', null, 'base64');
+		$return = $this->input->get('return', null, 'base64');###JCONTROLLERFORM_BEFORECANCEL###
 
 		$cancel = parent::cancel($key);
 
@@ -177,7 +177,7 @@ class ###Component###Controller###View### extends JControllerForm
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
-		}
+		}###JCONTROLLERFORM_AFTERCANCEL###
 		return $cancel;
 	}
 
diff --git a/admin/config.xml b/admin/config.xml
index b5e9f989e..220ced4d6 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -713,6 +713,21 @@
 					default="0"
 					button="false"
 				/>
+				<!-- Install Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="install"
+					label="COM_COMPONENTBUILDER_CONFIG_INSTALL_LABEL"
+					description="COM_COMPONENTBUILDER_CONFIG_INSTALL_DESCRIPTION"
+					class="list_class"
+					multiple="false"
+					default="1">
+					<!-- Option Set. -->
+					<option value="1">
+						COM_COMPONENTBUILDER_CONFIG_TRUE</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_CONFIG_FALSE</option>
+				</field>
 				<!-- Backup Field. Type: Checkbox. (joomla) -->
 				<field
 					type="checkbox"
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 86fb778ea..e326f83e0 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -2996,6 +2996,7 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_MESSAGE="Error! Please add website here."
+COM_COMPONENTBUILDER_CONFIG_FALSE="False"
 COM_COMPONENTBUILDER_CONFIG_FLAT_LOAD="Flat"
 COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS="Folder Paths"
 COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
@@ -3011,6 +3012,8 @@ COM_COMPONENTBUILDER_CONFIG_GLOBAL_DESC="The Global Parameters"
 COM_COMPONENTBUILDER_CONFIG_GLOBAL_LABEL="Global"
 COM_COMPONENTBUILDER_CONFIG_GRADIANT_LOAD="Gradient"
 COM_COMPONENTBUILDER_CONFIG_INACTIVE="Inactive"
+COM_COMPONENTBUILDER_CONFIG_INSTALL_DESCRIPTION="Component locally"
+COM_COMPONENTBUILDER_CONFIG_INSTALL_LABEL="Install"
 COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES="JCB Community Packages"
 COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area.  "
 COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL="Directories"
@@ -3133,6 +3136,7 @@ COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION="How long should th
 COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL="Update Cycle"
 COM_COMPONENTBUILDER_CONFIG_STRING_MANIPULATION="String Manipulation"
 COM_COMPONENTBUILDER_CONFIG_TLS="TLS"
+COM_COMPONENTBUILDER_CONFIG_TRUE="True"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
 for developing fast and powerful web interfaces. For more info visit <a href="https://getuikit.com/v2/" target="_blank">https://getuikit.com/v2/</a>"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_LABEL="Uikit2 Settings"
diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php
index 8fda47d15..1fec7ef29 100644
--- a/admin/models/fields/viewtabs.php
+++ b/admin/models/fields/viewtabs.php
@@ -35,7 +35,7 @@ class JFormFieldViewtabs extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-				// get the input from url
+		// get the input from url
 		$jinput = JFactory::getApplication()->input;
 		// get the view name & id
 		$fieldsID = $jinput->getInt('id', 0);
@@ -77,14 +77,19 @@ class JFormFieldViewtabs extends JFormFieldList
 		if (isset($item->addtabs) && ComponentbuilderHelper::checkJson($item->addtabs))
 		{
 			$items = json_decode($item->addtabs, true);
-			$nr = 1;
-			foreach($items as $itemName)
+			// check if the array has values
+			if (ComponentbuilderHelper::checkArray($items))
 			{
-				$options[] = JHtml::_('select.option', $nr, $itemName['name']);
-				$nr++;
+				$nr = 1;
+				foreach($items as $itemName)
+				{
+					$options[] = JHtml::_('select.option', $nr, $itemName['name']);
+					$nr++;
+				}
 			}
 		}
-		else
+		// check if any were loaded
+		if (!ComponentbuilderHelper::checkArray($options))
 		{
 			$options[] = JHtml::_('select.option', 1, JText::_('COM_COMPONENTBUILDER_DETAILS'));
 		}
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 76127e790..e1f1bffa5 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>13th June, 2019</creationDate>
+	<creationDate>17th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/site/language/en-GB/en-GB.com_componentbuilder.ini b/site/language/en-GB/en-GB.com_componentbuilder.ini
index 91d40c2c6..8afbb7c78 100644
--- a/site/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/site/language/en-GB/en-GB.com_componentbuilder.ini
@@ -82,6 +82,8 @@ COM_COMPONENTBUILDER_THE_PRIVATE_KEY_FIELD_COULD_NOT_BE_LOADED_FOR_BSB_SERVER="T
 COM_COMPONENTBUILDER_THE_PRIVATE_KEY_FILE_COULD_NOT_BE_LOADEDFOUND_FOR_BSB_SERVER="The private key file could not be loaded/found for <b>%s</b> server!"
 COM_COMPONENTBUILDER_THE_SERVER_DETAILS_FOR_BID_SB_COULD_NOT_BE_RETRIEVED="The server details for <b>(ID: %s)</b> could not be retrieved!"
 COM_COMPONENTBUILDER_THE_S_WAS_NOT_INSTALLED_AND_IS_STILL_IN_THE_TEMP_FOLDER="The %s was not Installed and is still in the temp folder."
+COM_COMPONENTBUILDER_THE_S_WAS_NOT_INSTALLED_BY_YOUR_REQUEST_AND_IS_ALSO_REMOVED_FROM_TEMP_FOLDER="The %s was not Installed by your request and is also removed from temp folder."
+COM_COMPONENTBUILDER_THE_S_WAS_NOT_INSTALLED_BY_YOUR_REQUEST_AND_IS_STILL_IN_THE_TEMP_FOLDER="The %s was not Installed by your request and is still in the temp folder."
 COM_COMPONENTBUILDER_THE_S_WAS_SUCCESSFULLY_COMPILED="The %s was successfully compiled."
 COM_COMPONENTBUILDER_THE_S_WAS_SUCCESSFULLY_INSTALLED_AND_REMOVED_FROM_TEMP_FOLDER="The %s was successfully Installed and removed from temp folder."
 COM_COMPONENTBUILDER_THE_URL_S_SET_TO_RETRIEVE_THE_PACKAGES_DOES_NOT_EXIST="The url (%s) set to retrieve the packages does not exist!"
diff --git a/site/models/api.php b/site/models/api.php
index 2602d7713..45f94e0ee 100644
--- a/site/models/api.php
+++ b/site/models/api.php
@@ -191,6 +191,7 @@ class ComponentbuilderModelApi extends JModelItem
 	{
 		$values = array(
 			'version' => 3,
+			'install' => 1,
 			'component' => 0,
 			'backup' => 0,
 			'repository' => 0,
@@ -224,11 +225,28 @@ class ComponentbuilderModelApi extends JModelItem
 					// get compiler model to run the installer
 					$model = ComponentbuilderHelper::getModel('compiler', JPATH_COMPONENT_ADMINISTRATOR);
 					// now install components
-					if ($model->install($this->compiler->componentFolderName.'.zip'))
+					if (1 == $values['install'] && $model->install($this->compiler->componentFolderName.'.zip'))
 					{
 						// component was installed
 						$this->messages[] = JText::sprintf('COM_COMPONENTBUILDER_THE_S_WAS_SUCCESSFULLY_INSTALLED_AND_REMOVED_FROM_TEMP_FOLDER', $this->compiler->componentFolderName);
 					}
+					elseif (1 != $values['install'])
+					{
+						jimport('joomla.filesystem.file');
+						$config = JFactory::getConfig();
+						$package = $config->get('tmp_path') . '/' . $this->compiler->componentFolderName.'.zip';
+						// just remove from temp
+						if (JFile::delete($package) && !is_file($package))
+						{
+							// component was installed
+							$this->messages[] = JText::sprintf('COM_COMPONENTBUILDER_THE_S_WAS_NOT_INSTALLED_BY_YOUR_REQUEST_AND_IS_ALSO_REMOVED_FROM_TEMP_FOLDER', $this->compiler->componentFolderName);
+						}
+						else
+						{
+							// component was not installed
+							$this->messages[] = JText::sprintf('COM_COMPONENTBUILDER_THE_S_WAS_NOT_INSTALLED_BY_YOUR_REQUEST_AND_IS_STILL_IN_THE_TEMP_FOLDER', $this->compiler->componentFolderName);
+						}
+					}
 					else
 					{
 						// component was not installed
-- 
2.40.1


From 8f8546502a451f62d0ed90684b489981ff71d9c3 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Tue, 18 Jun 2019 14:38:34 +0200
Subject: [PATCH 19/26] Added a new convention to how JCB builds field names,
 so that it does not remove/convert the numbers. gh-427

---
 README.md                        |  2 +-
 admin/README.txt                 |  2 +-
 admin/helpers/compiler/a_Get.php | 59 ++++++++++++++++++++++++++++----
 componentbuilder.xml             |  2 +-
 4 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c742a1cee..73b0a6185 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 17th June, 2019
++ *Last Build*: 18th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index c742a1cee..73b0a6185 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 17th June, 2019
++ *Last Build*: 18th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 86006c249..7f323bfc1 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -689,6 +689,13 @@ class Get
 	 */
 	public $minify = 0;
 
+	/**
+	 * field name builder switch
+	 * 
+	 * @var    int
+	 */
+	public $fieldNameBuilder = 0;
+
 	/**
 	 * Is Tidy Enabled
 	 * 
@@ -750,6 +757,8 @@ class Get
 			$this->params = JComponentHelper::getParams('com_componentbuilder');
 			// set the minfy switch of the JavaScript
 			$this->minify = (isset($config['minify']) && $config['minify'] != 2) ? $config['minify'] : $this->params->get('minify', 0);
+			// field name builder switch between conventions
+			$this->fieldNameBuilder = $this->params->get('field_name_builder', 0); // change this to 1 for testing the new convention
 			// set the global language
 			$this->langTag = $this->params->get('language', $this->langTag);
 			// setup the main language array
@@ -2872,9 +2881,9 @@ class Get
 			return 'error';
 		}
 		// set the type name
-		$type_name = ComponentbuilderHelper::safeString($field['settings']->type_name);
+		$type_name = $this->safeName($field['settings']->type_name);
 		// set the name of the field
-		$name = ComponentbuilderHelper::safeString($field['settings']->name);
+		$name = $this->safeName($field['settings']->name);
 		// check that we have the poperties
 		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
 		{
@@ -2908,7 +2917,7 @@ class Get
 							{
 								// set other category details
 								$this->catOtherName[$listViewName] = array(
-									'name' => ComponentbuilderHelper::safeString($otherName),
+									'name' => $this->safeName($otherName),
 									'views' => ComponentbuilderHelper::safeString($otherViews),
 									'view' => ComponentbuilderHelper::safeString($otherView)
 								);
@@ -2928,7 +2937,7 @@ class Get
 					else
 					{
 						// get value from xml
-						$xml = ComponentbuilderHelper::safeString($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'), $this->placeholders));
+						$xml = $this->safeName($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'), $this->placeholders));
 						// check if a value was found
 						if (ComponentbuilderHelper::checkString($xml))
 						{
@@ -2951,6 +2960,44 @@ class Get
 		return $name;
 	}
 
+	/**
+	* Making field names safe
+	*
+	* @input	string   The you would like to make safe
+	*
+	* @returns string on success
+	**/
+	protected function safeName($string, $spacer = '_')
+	{
+		// use the new convention
+		if (1 == $this->fieldNameBuilder)
+		{
+			// 0nly continue if we have a string
+			if (ComponentbuilderHelper::checkString($string))
+			{
+				// check that the first character is not a number
+				if (is_numeric(substr($string, 0, 1)))
+				{
+					$string = ComponentbuilderHelper::replaceNumbers($string);
+				}
+				// remove all other strange characters
+				$string = trim($string);
+				$string = preg_replace('/'.$spacer.'+/', ' ', $string);
+				$string = preg_replace('/\s+/', ' ', $string);
+				// remove all and keep only characters and numbers
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+				// replace white space with underscore (SAFEST OPTION)
+				$string = preg_replace('/\s+/', $spacer, $string);
+				// default is to return lower
+				return strtolower($string);
+			}
+			// not a string
+			return '';
+		}
+		// use the default (original behaviour/convention)
+		return ComponentbuilderHelper::safeString($string);
+	}
+
 	/**
 	 * Count how many times the same field is used per view
 	 *
@@ -2994,13 +3041,13 @@ class Get
 		{
 			$counter = 1;
 			// set the unique name
-			$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			$uniqueName = $this->safeName($name . '_' . $counter);
 			while (isset($this->uniqueNames[$view]['names'][$uniqueName]))
 			{
 				// increment the number
 				$counter++;
 				// try again
-				$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+				$uniqueName = $this->safeName($name . '_' . $counter);
 			}
 			// set the new name number
 			$this->uniqueNames[$view]['names'][$uniqueName] = $counter;
diff --git a/componentbuilder.xml b/componentbuilder.xml
index e1f1bffa5..c9bf94679 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>17th June, 2019</creationDate>
+	<creationDate>18th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From e84105c3bda99ab9be1e613377153d2be2b144c5 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Tue, 18 Jun 2019 16:12:49 +0200
Subject: [PATCH 20/26] Adapted the safeName to a global safeFieldName method
 so to use it all over JCB to safely build field names. gh-427

---
 README.md                          |  2 +-
 admin/README.txt                   |  2 +-
 admin/helpers/compiler/a_Get.php   | 61 ++++--------------------------
 admin/helpers/componentbuilder.php | 52 ++++++++++++++++++++++++-
 admin/models/field.php             |  4 +-
 site/helpers/componentbuilder.php  | 52 ++++++++++++++++++++++++-
 6 files changed, 110 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 73b0a6185..ad18f9cb6 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206865**
++ *Line count*: **206959**
 + *Field count*: **1141**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 73b0a6185..ad18f9cb6 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -150,7 +150,7 @@ TODO
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206865**
++ *Line count*: **206959**
 + *Field count*: **1141**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 7f323bfc1..4283c3073 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -689,13 +689,6 @@ class Get
 	 */
 	public $minify = 0;
 
-	/**
-	 * field name builder switch
-	 * 
-	 * @var    int
-	 */
-	public $fieldNameBuilder = 0;
-
 	/**
 	 * Is Tidy Enabled
 	 * 
@@ -757,8 +750,6 @@ class Get
 			$this->params = JComponentHelper::getParams('com_componentbuilder');
 			// set the minfy switch of the JavaScript
 			$this->minify = (isset($config['minify']) && $config['minify'] != 2) ? $config['minify'] : $this->params->get('minify', 0);
-			// field name builder switch between conventions
-			$this->fieldNameBuilder = $this->params->get('field_name_builder', 0); // change this to 1 for testing the new convention
 			// set the global language
 			$this->langTag = $this->params->get('language', $this->langTag);
 			// setup the main language array
@@ -2863,7 +2854,7 @@ class Get
 	 * 
 	 * @param   object   $field         The field object
 	 * @param   string   $listViewName  The list view name
-	 * @param   string   $amicably      The peaceful resolve
+	 * @param   string   $amicably      The peaceful resolve (for fields in subforms in same view :)
 	 * 
 	 * @return  string   Success returns field name
 	 * 
@@ -2881,9 +2872,9 @@ class Get
 			return 'error';
 		}
 		// set the type name
-		$type_name = $this->safeName($field['settings']->type_name);
+		$type_name = ComponentbuilderHelper::safeFieldName($field['settings']->type_name);
 		// set the name of the field
-		$name = $this->safeName($field['settings']->name);
+		$name = ComponentbuilderHelper::safeFieldName($field['settings']->name);
 		// check that we have the poperties
 		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
 		{
@@ -2917,7 +2908,7 @@ class Get
 							{
 								// set other category details
 								$this->catOtherName[$listViewName] = array(
-									'name' => $this->safeName($otherName),
+									'name' => ComponentbuilderHelper::safeFieldName($otherName),
 									'views' => ComponentbuilderHelper::safeString($otherViews),
 									'view' => ComponentbuilderHelper::safeString($otherView)
 								);
@@ -2937,7 +2928,7 @@ class Get
 					else
 					{
 						// get value from xml
-						$xml = $this->safeName($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'), $this->placeholders));
+						$xml = ComponentbuilderHelper::safeFieldName($this->setPlaceholders(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'), $this->placeholders));
 						// check if a value was found
 						if (ComponentbuilderHelper::checkString($xml))
 						{
@@ -2960,44 +2951,6 @@ class Get
 		return $name;
 	}
 
-	/**
-	* Making field names safe
-	*
-	* @input	string   The you would like to make safe
-	*
-	* @returns string on success
-	**/
-	protected function safeName($string, $spacer = '_')
-	{
-		// use the new convention
-		if (1 == $this->fieldNameBuilder)
-		{
-			// 0nly continue if we have a string
-			if (ComponentbuilderHelper::checkString($string))
-			{
-				// check that the first character is not a number
-				if (is_numeric(substr($string, 0, 1)))
-				{
-					$string = ComponentbuilderHelper::replaceNumbers($string);
-				}
-				// remove all other strange characters
-				$string = trim($string);
-				$string = preg_replace('/'.$spacer.'+/', ' ', $string);
-				$string = preg_replace('/\s+/', ' ', $string);
-				// remove all and keep only characters and numbers
-				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
-				// replace white space with underscore (SAFEST OPTION)
-				$string = preg_replace('/\s+/', $spacer, $string);
-				// default is to return lower
-				return strtolower($string);
-			}
-			// not a string
-			return '';
-		}
-		// use the default (original behaviour/convention)
-		return ComponentbuilderHelper::safeString($string);
-	}
-
 	/**
 	 * Count how many times the same field is used per view
 	 *
@@ -3041,13 +2994,13 @@ class Get
 		{
 			$counter = 1;
 			// set the unique name
-			$uniqueName = $this->safeName($name . '_' . $counter);
+			$uniqueName = ComponentbuilderHelper::safeFieldName($name . '_' . $counter);
 			while (isset($this->uniqueNames[$view]['names'][$uniqueName]))
 			{
 				// increment the number
 				$counter++;
 				// try again
-				$uniqueName = $this->safeName($name . '_' . $counter);
+				$uniqueName = ComponentbuilderHelper::safeFieldName($name . '_' . $counter);
 			}
 			// set the new name number
 			$this->uniqueNames[$view]['names'][$uniqueName] = $counter;
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 5db1f8202..2fb2979ad 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -124,6 +124,54 @@ abstract class ComponentbuilderHelper
 		'JPATH_THEMES' => JPATH_THEMES
 	);
 
+	/**
+	* The field builder switch
+	**/
+	protected static $fieldNameBuilder = false;
+
+	/**
+	* Making field names safe
+	*
+	* @input	string   The you would like to make safe
+	*
+	* @returns string on success
+	**/
+	public static function safeFieldName($string, $spacer = '_')
+	{
+		// get global value
+		if (self::$fieldNameBuilder === false)
+		{
+			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 0); // change this to 1 for testing the new convention
+		}
+		// use the new convention
+		if (1 == self::$fieldNameBuilder)
+		{
+			// 0nly continue if we have a string
+			if (self::checkString($string))
+			{
+				// check that the first character is not a number
+				if (is_numeric(substr($string, 0, 1)))
+				{
+					$string = self::replaceNumbers($string);
+				}
+				// remove all other strange characters
+				$string = trim($string);
+				$string = preg_replace('/'.$spacer.'+/', ' ', $string);
+				$string = preg_replace('/\s+/', ' ', $string);
+				// remove all and keep only characters and numbers
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+				// replace white space with underscore (SAFEST OPTION)
+				$string = preg_replace('/\s+/', $spacer, $string);
+				// default is to return lower
+				return strtolower($string);
+			}
+			// not a string
+			return '';
+		}
+		// use the default (original behaviour/convention)
+		return self::safeString($string);
+	}
+
 	/*
 	 * Get the Array of Existing Validation Rule Names
 	 *
@@ -1200,13 +1248,13 @@ abstract class ComponentbuilderHelper
 			}
 			else
 			{
-				$name = self::safeString(self::getBetween($field->xml,'name="','"'));
+				$name = self::safeFieldName(self::getBetween($field->xml,'name="','"'));
 			}
 
 			// use field core name only if not found in xml
 			if (!self::checkString($name))
 			{
-				$name = self::safeString($field->name);;
+				$name = self::safeFieldName($field->name);
 			}
 			return array('name' => $name, 'type' => $field->type_name);
 		}
diff --git a/admin/models/field.php b/admin/models/field.php
index a0809d2b6..b467b9b67 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -923,8 +923,6 @@ class ComponentbuilderModelField extends JModelAdmin
 				// make sure we have the correct values
 				if (ComponentbuilderHelper::checkArray($property) && isset($property['name']) && ComponentbuilderHelper::checkString($property['name']) && (isset($property['value']) || 'default' === $property['name']))
 				{
-					// fix the name (TODO)
-					// $property['name'] = ComponentbuilderHelper::safeString($property['name']);
 					// some fixes, just in case (more can be added)
 					switch ($property['name'])
 					{
@@ -937,7 +935,7 @@ class ComponentbuilderModelField extends JModelAdmin
 							}
 							else
 							{
-								$property['value'] = ComponentbuilderHelper::safeString($property['value']);
+								$property['value'] = ComponentbuilderHelper::safeFieldName($property['value']);
 							}
 						break;
 						case 'type':
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index 11092047b..ec7f161ff 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -124,6 +124,54 @@ abstract class ComponentbuilderHelper
 		'JPATH_THEMES' => JPATH_THEMES
 	);
 
+	/**
+	* The field builder switch
+	**/
+	protected static $fieldNameBuilder = false;
+
+	/**
+	* Making field names safe
+	*
+	* @input	string   The you would like to make safe
+	*
+	* @returns string on success
+	**/
+	public static function safeFieldName($string, $spacer = '_')
+	{
+		// get global value
+		if (self::$fieldNameBuilder === false)
+		{
+			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 0); // change this to 1 for testing the new convention
+		}
+		// use the new convention
+		if (1 == self::$fieldNameBuilder)
+		{
+			// 0nly continue if we have a string
+			if (self::checkString($string))
+			{
+				// check that the first character is not a number
+				if (is_numeric(substr($string, 0, 1)))
+				{
+					$string = self::replaceNumbers($string);
+				}
+				// remove all other strange characters
+				$string = trim($string);
+				$string = preg_replace('/'.$spacer.'+/', ' ', $string);
+				$string = preg_replace('/\s+/', ' ', $string);
+				// remove all and keep only characters and numbers
+				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
+				// replace white space with underscore (SAFEST OPTION)
+				$string = preg_replace('/\s+/', $spacer, $string);
+				// default is to return lower
+				return strtolower($string);
+			}
+			// not a string
+			return '';
+		}
+		// use the default (original behaviour/convention)
+		return self::safeString($string);
+	}
+
 	/*
 	 * Get the Array of Existing Validation Rule Names
 	 *
@@ -1200,13 +1248,13 @@ abstract class ComponentbuilderHelper
 			}
 			else
 			{
-				$name = self::safeString(self::getBetween($field->xml,'name="','"'));
+				$name = self::safeFieldName(self::getBetween($field->xml,'name="','"'));
 			}
 
 			// use field core name only if not found in xml
 			if (!self::checkString($name))
 			{
-				$name = self::safeString($field->name);;
+				$name = self::safeFieldName($field->name);
 			}
 			return array('name' => $name, 'type' => $field->type_name);
 		}
-- 
2.40.1


From 75656d940a5c695f75d0d6e7b1101e1e5ffbe385 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sat, 22 Jun 2019 12:43:26 +0200
Subject: [PATCH 21/26] Added many events to the compiler as the first step to
 allow 3rd party integration with the compiler via plugins. gh-429

---
 README.md                                     |  6 +-
 admin/README.txt                              |  6 +-
 admin/compiler/joomla_3/router.php            |  2 +
 admin/config.xml                              | 10 ++
 admin/helpers/compiler.php                    |  6 ++
 admin/helpers/compiler/a_Get.php              | 96 +++++++++++++++++++
 admin/helpers/compiler/b_Structure.php        |  4 +
 admin/helpers/compiler/c_Fields.php           |  8 ++
 admin/helpers/compiler/e_Interpretation.php   | 59 +++++++++---
 admin/helpers/compiler/f_Infusion.php         | 43 ++++++++-
 .../en-GB/en-GB.com_componentbuilder.ini      |  2 +
 admin/sql/install.mysql.utf8.sql              |  2 +-
 componentbuilder.xml                          |  2 +-
 site/router.php                               |  2 +
 14 files changed, 227 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index ad18f9cb6..53a4587a1 100644
--- a/README.md
+++ b/README.md
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 18th June, 2019
++ *Last Build*: 22nd June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206959**
-+ *Field count*: **1141**
++ *Line count*: **206973**
++ *Field count*: **1142**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/README.txt b/admin/README.txt
index ad18f9cb6..53a4587a1 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 18th June, 2019
++ *Last Build*: 22nd June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206959**
-+ *Field count*: **1141**
++ *Line count*: **206973**
++ *Field count*: **1142**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/compiler/joomla_3/router.php b/admin/compiler/joomla_3/router.php
index c3084c95a..272e42940 100644
--- a/admin/compiler/joomla_3/router.php
+++ b/admin/compiler/joomla_3/router.php
@@ -143,6 +143,8 @@ class ###Component###Router extends JComponentRouterBase
 		{
 			$getTable = '#__categories';
 			$query->from($db->quoteName($getTable));
+			// we need this to target the components categories (TODO will keep an eye on this)
+			$query->where($db->quoteName('extension') . ' LIKE '. $db->quote((string)'com_' . $main . '%'));
 		}
 		else
 		{
diff --git a/admin/config.xml b/admin/config.xml
index 220ced4d6..b976865fa 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -57,6 +57,16 @@
 			folder="editors"
 			filter="cmd"
 		/>
+		<!-- Compiler_plugin Field. Type: Plugins. (joomla) -->
+		<field
+			type="plugins"
+			name="compiler_plugin"
+			label="COM_COMPONENTBUILDER_CONFIG_COMPILER_PLUGIN_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_COMPILER_PLUGIN_DESCRIPTION"
+			multiple="true"
+			folder="extension"
+			filter="cmd"
+		/>
 		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
 		<!-- Manage_jcb_package_directories Field. Type: Radio. (joomla) -->
diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php
index 08e3a672a..96a740dd2 100644
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@@ -253,6 +253,8 @@ class Compiler extends Infusion
 	 */
 	protected function setFileContent(&$name, &$path, &$bom, $view = null)
 	{
+		// Trigger Event: jcb_ce_onBeforeSetFileContent
+		$this->triggerEvent('jcb_ce_onBeforeSetFileContent', array(&$name, &$path, &$bom, &$view));
 		// set the file name
 		$this->fileContentStatic[$this->hhh . 'FILENAME' . $this->hhh] = $name;
 		// check if the file should get PHP opening
@@ -263,6 +265,8 @@ class Compiler extends Infusion
 		}
 		// get content of the file
 		$string = ComponentbuilderHelper::getFileContents($path);
+		// Trigger Event: jcb_ce_onGetFileContents
+		$this->triggerEvent('jcb_ce_onGetFileContents', array(&$string, &$name, &$path, &$bom, &$view));
 		// see if we should add a BOM
 		if (strpos($string, $this->hhh . 'BOM' . $this->hhh) !== false)
 		{
@@ -281,6 +285,8 @@ class Compiler extends Infusion
 		{
 			$answer = $this->setDynamicValues($answer);
 		}
+		// Trigger Event: jcb_ce_onBeforeSetFileContent
+		$this->triggerEvent('jcb_ce_onBeforeWriteFileContent', array(&$answer, &$name, &$path, &$bom, &$view));
 		// add answer back to file
 		$this->writeFile($path, $answer);
 		// count the file lines
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 4283c3073..d257f2aac 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -736,6 +736,13 @@ class Get
 	 */
 	public $mysqlTableSetting = array();
 
+	/**
+	 * event plugin trigger switch
+	 * 
+	 * @var    boolean
+	 */
+	protected $active_plugins = false;
+
 	/**
 	 * Constructor
 	 */
@@ -748,6 +755,21 @@ class Get
 			$this->app = JFactory::getApplication();
 			// Set the params
 			$this->params = JComponentHelper::getParams('com_componentbuilder');
+			// get active plugins
+			if (($plugins = $this->params->get('compiler_plugin', false)) !== false)
+			{
+				foreach ($plugins as $plugin)
+				{
+					// get posible plugins
+					if (\JPluginHelper::isEnabled('extension', $plugin))
+					{
+						// Import the appropriate plugin group.
+						\JPluginHelper::importPlugin('extension', $plugin);
+						// activate events
+						$this->active_plugins = true;
+					}
+				}
+			}
 			// set the minfy switch of the JavaScript
 			$this->minify = (isset($config['minify']) && $config['minify'] != 2) ? $config['minify'] : $this->params->get('minify', 0);
 			// set the global language
@@ -866,6 +888,40 @@ class Get
 		return '';
 	}
 
+	/**
+	 * Trigger events
+	 * 
+	 * @param   string   $event  The event to trigger
+	 * @param   mix      $data   The values to pass to the event/plugin
+	 * 
+	 * @return  string
+	 * 
+	 */
+	public function triggerEvent($event, $data)
+	{
+		// only exicute if plugins were loaded (active)
+		if ($this->active_plugins)
+		{
+			// Get the dispatcher.
+			$dispatcher = \JEventDispatcher::getInstance();
+
+			// Trigger the form preparation event.
+			$results = $dispatcher->trigger($event, $data);
+
+			// Check for errors encountered while trigger the event
+			if (count($results) && in_array(false, $results, true))
+			{
+				// Get the last error.
+				$error = $dispatcher->getError();
+
+				if (!($error instanceof \Exception))
+				{
+					throw new \Exception($error);
+				}
+			}
+		}
+	}
+
 	/**
 	 * get all System Placeholders
 	 *
@@ -963,12 +1019,18 @@ class Get
 		$query->join('LEFT', $this->db->quoteName('#__componentbuilder_component_placeholders', 'k') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('k.joomla_component') . ')');
 		$query->where($this->db->quoteName('a.id') . ' = ' . (int) $this->componentID);
 
+		// Trigger Event: jcb_ce_onBeforeQueryComponentData
+		$this->triggerEvent('jcb_ce_onBeforeQueryComponentData', array(&$this->componentID, &$query, &$this->db));
+
 		// Reset the query using our newly populated query object.
 		$this->db->setQuery($query);
 
 		// Load the results as a list of stdClass objects
 		$component = $this->db->loadObject();
 
+		// Trigger Event: jcb_ce_onBeforeModelComponentData
+		$this->triggerEvent('jcb_ce_onBeforeModelComponentData', array(&$component));
+
 		// set upater
 		$updater = array(
 			'unique' => array(
@@ -1510,6 +1572,9 @@ class Get
 			$component->toignore = array('.git');
 		}
 
+		// Trigger Event: jcb_ce_onAfterModelComponentData
+		$this->triggerEvent('jcb_ce_onAfterModelComponentData', array(&$component));
+
 		// return the found component data
 		return $component;
 	}
@@ -1556,6 +1621,9 @@ class Get
 			$query->join('LEFT', $this->db->quoteName('#__componentbuilder_admin_custom_tabs', 't') . ' ON (' . $this->db->quoteName('a.id') . ' = ' . $this->db->quoteName('t.admin_view') . ')');
 			$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
 
+			// Trigger Event: jcb_ce_onBeforeQueryViewData
+			$this->triggerEvent('jcb_ce_onBeforeQueryViewData', array(&$id, &$query, &$this->db));
+
 			// Reset the query using our newly populated query object.
 			$this->db->setQuery($query);
 
@@ -1611,6 +1679,10 @@ class Get
 			$this->placeholders[$this->bbb . 'Views' . $this->ddd] = $this->placeholders[$this->hhh . 'Views' . $this->hhh];
 			$this->placeholders[$this->bbb . 'VIEW' . $this->ddd] = $this->placeholders[$this->hhh . 'VIEW' . $this->hhh];
 			$this->placeholders[$this->bbb . 'VIEWS' . $this->ddd] = $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh];
+
+			// Trigger Event: jcb_ce_onBeforeModelViewData
+			$this->triggerEvent('jcb_ce_onBeforeModelViewData', array(&$view, &$this->placeholders));
+
 			// add the tables
 			$view->addtables = (isset($view->addtables) && ComponentbuilderHelper::checkJson($view->addtables)) ? json_decode($view->addtables, true) : null;
 			if (ComponentbuilderHelper::checkArray($view->addtables))
@@ -2205,6 +2277,10 @@ class Get
 				// remove the table values since we moved to another object
 				unset($view->{'mysql_table_' . $_mysqlTableKey});
 			}
+
+			// Trigger Event: jcb_ce_onAfterModelViewData
+			$this->triggerEvent('jcb_ce_onAfterModelViewData', array(&$view, &$this->placeholders));
+
 			// clear placeholders
 			unset($this->placeholders[$this->hhh . 'view' . $this->hhh]);
 			unset($this->placeholders[$this->hhh . 'views' . $this->hhh]);
@@ -2244,11 +2320,18 @@ class Get
 		$query->from('#__componentbuilder_' . $table . ' AS a');
 		$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
 
+		// Trigger Event: jcb_ce_onBeforeQueryCustomViewData
+		$this->triggerEvent('jcb_ce_onBeforeQueryCustomViewData', array(&$id, &$table, &$query, &$this->db));
+
 		// Reset the query using our newly populated query object.
 		$this->db->setQuery($query);
 
 		// Load the results as a list of stdClass objects (see later for more options on retrieving data).
 		$view = $this->db->loadObject();
+
+		// Trigger Event: jcb_ce_onBeforeModelCustomViewData
+		$this->triggerEvent('jcb_ce_onBeforeModelCustomViewData', array(&$view, &$id, &$table));
+
 		if ($table === 'site_view')
 		{
 			$this->lang = 'site';
@@ -2485,6 +2568,10 @@ class Get
 			}
 			unset($view->custom_button);
 		}
+
+		// Trigger Event: jcb_ce_onAfterModelCustomViewData
+		$this->triggerEvent('jcb_ce_onAfterModelCustomViewData', array(&$view));
+
 		// return the found view data
 		return $view;
 	}
@@ -2513,6 +2600,9 @@ class Get
 			$query->join('LEFT', $this->db->quoteName('#__componentbuilder_fieldtype', 'c') . ' ON (' . $this->db->quoteName('a.fieldtype') . ' = ' . $this->db->quoteName('c.id') . ')');
 			$query->where($this->db->quoteName('a.id') . ' = ' . $this->db->quote($id));
 
+			// Trigger Event: jcb_ce_onBeforeQueryFieldData
+			$this->triggerEvent('jcb_ce_onBeforeQueryFieldData', array(&$id, &$query, &$this->db));
+
 			// Reset the query using our newly populated query object.
 			$this->db->setQuery($query);
 			$this->db->execute();
@@ -2521,6 +2611,9 @@ class Get
 				// Load the results as a list of stdClass objects (see later for more options on retrieving data).
 				$field = $this->db->loadObject();
 
+				// Trigger Event: jcb_ce_onBeforeModelFieldData
+				$this->triggerEvent('jcb_ce_onBeforeModelFieldData', array(&$field));
+
 				// adding a fix for the changed name of type to fieldtype
 				$field->type = $field->fieldtype;
 
@@ -2596,6 +2689,9 @@ class Get
 				// get the last used version
 				$field->history = $this->getHistoryWatch('field', $id);
 
+				// Trigger Event: jcb_ce_onAfterModelFieldData
+				$this->triggerEvent('jcb_ce_onAfterModelFieldData', array(&$field));
+
 				$this->_fieldData[$id] = $field;
 			}
 			else
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index e883bc40f..71752637d 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -367,6 +367,8 @@ class Structure extends Get
 			$this->setLibaries();
 			// set the Joomla Version Data
 			$this->joomlaVersionData = $this->setJoomlaVersionData();
+			// Trigger Event: jcb_ce_onAfterSetJoomlaVersionData
+			$this->triggerEvent('jcb_ce_onAfterSetJoomlaVersionData', array(&$this->joomlaVersionData));
 			// set the dashboard
 			$this->setDynamicDashboard();
 			// set the new folders
@@ -416,6 +418,8 @@ class Structure extends Get
 	{
 		if (ComponentbuilderHelper::checkArray($this->libraries))
 		{
+			// Trigger Event: jcb_ce_onBeforeSetLibaries
+			$this->triggerEvent('jcb_ce_onBeforeSetLibaries', array(&$this->libraries));
 			// creat the main component folder
 			if (!JFolder::exists($this->componentPath))
 			{
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 179c8dedb..ae9178e61 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -456,11 +456,15 @@ class Fields extends Structure
 		$dynamicFields = '';
 		// set the custom table key
 		$dbkey = 'g';
+		// Trigger Event: jcb_ce_onBeforeBuildFields
+		$this->triggerEvent('jcb_ce_onBeforeBuildFields', array(&$dynamicFields, &$readOnly, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// TODO we should add the global and local view switch if field for front end
 		foreach ($view['settings']->fields as $field)
 		{
 			$dynamicFields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $view_name_single, $view_name_list, $this->placeholders, $dbkey, true);
 		}
+		// Trigger Event: jcb_ce_onAfterBuildFields
+		$this->triggerEvent('jcb_ce_onAfterBuildFields', array(&$dynamicFields, &$readOnly, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// set the default fields
 		$fieldSet = array();
 		$fieldSet[] = '<fieldset name="details">';
@@ -724,11 +728,15 @@ class Fields extends Structure
 		$dynamicFieldsXML = array();
 		// set the custom table key
 		$dbkey = 'g';
+		// Trigger Event: jcb_ce_onBeforeBuildFields
+		$this->triggerEvent('jcb_ce_onBeforeBuildFields', array(&$dynamicFieldsXML, &$readOnlyXML, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// TODO we should add the global and local view switch if field for front end
 		foreach ($view['settings']->fields as $field)
 		{
 			$dynamicFieldsXML[] = $this->setDynamicField($field, $view, $view['settings']->type, $langView, $view_name_single, $view_name_list, $this->placeholders, $dbkey, true);
 		}
+		// Trigger Event: jcb_ce_onAfterBuildFields
+		$this->triggerEvent('jcb_ce_onAfterBuildFields', array(&$dynamicFieldsXML, &$readOnlyXML, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// set the default fields
 		$XML = new simpleXMLElement('<a/>');
 		$fieldSetXML = $XML->addChild('fieldset');
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 3328eb595..33ebf3baf 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -3353,11 +3353,13 @@ class Interpretation extends Fields
 			if ($view['settings']->main_get->gettype == 1 && ComponentbuilderHelper::checkArray($view['settings']->main_get->plugin_events))
 			{
 				$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Process the content plugins.";
-				$method .= PHP_EOL . $this->_t(2) . "JPluginHelper::importPlugin('content');";
-				$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Setup Event Object.";
-				$method .= PHP_EOL . $this->_t(2) . "\$this->item->event = new stdClass;";
-				$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Check if item has params, or pass global params";
-				$method .= PHP_EOL . $this->_t(2) . "\$params = (isset(\$this->item->params) && " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkJson(\$this->item->params)) ? json_decode(\$this->item->params) : \$this->params;";
+				$method .= PHP_EOL . $this->_t(2) . "if (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkObject(\$this->item))";
+				$method .= PHP_EOL . $this->_t(2) . "{";
+				$method .= PHP_EOL . $this->_t(3) . "JPluginHelper::importPlugin('content');";
+				$method .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Setup Event Object.";
+				$method .= PHP_EOL . $this->_t(3) . "\$this->item->event = new stdClass;";
+				$method .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " Check if item has params, or pass global params";
+				$method .= PHP_EOL . $this->_t(3) . "\$params = (isset(\$this->item->params) && " . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh] . "Helper::checkJson(\$this->item->params)) ? json_decode(\$this->item->params) : \$this->params;";
 				// load the defaults
 				foreach ($view['settings']->main_get->plugin_events as $plugin_event)
 				{
@@ -3370,11 +3372,12 @@ class Interpretation extends Fields
 					}
 					else
 					{
-						$method .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " " . $plugin_event . " Event Trigger.";
-						$method .= PHP_EOL . $this->_t(2) . "\$results = \$dispatcher->trigger('" . $plugin_event . "', array('com_" . $this->componentCodeName . "." . $view['settings']->context . "', &\$this->item, &\$params, 0));";
-						$method .= PHP_EOL . $this->_t(2) . '$this->item->event->' . $plugin_event . ' = trim(implode("\n", $results));';
+						$method .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(__LINE__) . " " . $plugin_event . " Event Trigger.";
+						$method .= PHP_EOL . $this->_t(3) . "\$results = \$dispatcher->trigger('" . $plugin_event . "', array('com_" . $this->componentCodeName . "." . $view['settings']->context . "', &\$this->item, &\$params, 0));";
+						$method .= PHP_EOL . $this->_t(3) . '$this->item->event->' . $plugin_event . ' = trim(implode("\n", $results));';
 					}
 				}
+				$method .= PHP_EOL . $this->_t(2) . "}";
 			}
 			$method .= PHP_EOL . PHP_EOL . $this->_t(2) . "parent::display(\$tpl);";
 		}
@@ -6535,6 +6538,9 @@ class Interpretation extends Fields
 	{
 		// add final list of needed lang strings
 		$componentName = JFilterOutput::cleanText($this->componentData->name);
+		// Trigger Event: jcb_ce_onBeforeBuildAdminLang
+		$this->triggerEvent('jcb_ce_onBeforeBuildAdminLang', array(&$this->langContent['admin'], &$this->langPrefix, &$componentName));
+		// start loding the defaults
 		$this->langContent['adminsys'][$this->langPrefix] = $componentName;
 		$this->langContent['adminsys'][$this->langPrefix . '_CONFIGURATION'] = $componentName . ' Configuration';
 		$this->langContent['admin'][$this->langPrefix] = $componentName;
@@ -6624,6 +6630,9 @@ class Interpretation extends Fields
 		}
 		if (isset($this->langContent['admin']) && ComponentbuilderHelper::checkArray($this->langContent['admin']))
 		{
+			// Trigger Event: jcb_ce_onAfterBuildAdminLang
+			$this->triggerEvent('jcb_ce_onAfterBuildAdminLang', array(&$this->langContent['admin'], &$this->langPrefix, &$componentName));
+			// sort the strings
 			ksort($this->langContent['admin']);
 			// load to global languages
 			$this->languages[$this->langTag]['admin'] = $this->langContent['admin'];
@@ -6638,7 +6647,11 @@ class Interpretation extends Fields
 	public function setLangSite()
 	{
 		// add final list of needed lang strings
-		$this->langContent['site'][$this->langPrefix] = ComponentbuilderHelper::safeString($this->componentData->name, 'W');
+		$componentName = JFilterOutput::cleanText($this->componentData->name);
+		// Trigger Event: jcb_ce_onBeforeBuildSiteLang
+		$this->triggerEvent('jcb_ce_onBeforeBuildSiteLang', array(&$this->langContent['site'], &$this->langPrefix, &$componentName));
+		// add final list of needed lang strings
+		$this->langContent['site'][$this->langPrefix] = $componentName;
 		// some more defaults
 		$this->langContent['site']['JTOOLBAR_APPLY'] = "Save";
 		$this->langContent['site']['JTOOLBAR_SAVE_AS_COPY'] = "Save as Copy";
@@ -6677,6 +6690,9 @@ class Interpretation extends Fields
 		}
 		if (isset($this->langContent['site']) && ComponentbuilderHelper::checkArray($this->langContent['site']))
 		{
+			// Trigger Event: jcb_ce_onAfterBuildSiteLang
+			$this->triggerEvent('jcb_ce_onAfterBuildSiteLang', array(&$this->langContent['site'], &$this->langPrefix, &$componentName));
+			// sort the strings
 			ksort($this->langContent['site']);
 			// load to global languages
 			$this->languages[$this->langTag]['site'] = $this->langContent['site'];
@@ -6691,7 +6707,11 @@ class Interpretation extends Fields
 	public function setLangSiteSys()
 	{
 		// add final list of needed lang strings
-		$this->langContent['sitesys'][$this->langPrefix] = ComponentbuilderHelper::safeString($this->componentData->name, 'W');
+		$componentName = JFilterOutput::cleanText($this->componentData->name);
+		// Trigger Event: jcb_ce_onBeforeBuildSiteSysLang
+		$this->triggerEvent('jcb_ce_onBeforeBuildSiteSysLang', array(&$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
+		// add final list of needed lang strings
+		$this->langContent['sitesys'][$this->langPrefix] = $componentName;
 		$this->langContent['sitesys'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
 		$this->langContent['sitesys'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
 
@@ -6705,6 +6725,9 @@ class Interpretation extends Fields
 		}
 		if (isset($this->langContent['sitesys']) && ComponentbuilderHelper::checkArray($this->langContent['sitesys']))
 		{
+			// Trigger Event: jcb_ce_onAfterBuildSiteSysLang
+			$this->triggerEvent('jcb_ce_onAfterBuildSiteSysLang', array(&$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
+			// sort strings
 			ksort($this->langContent['sitesys']);
 			// load to global languages
 			$this->languages[$this->langTag]['sitesys'] = $this->langContent['sitesys'];
@@ -6718,6 +6741,10 @@ class Interpretation extends Fields
 
 	public function setLangAdminSys()
 	{
+		// add final list of needed lang strings
+		$componentName = JFilterOutput::cleanText($this->componentData->name);
+		// Trigger Event: jcb_ce_onBeforeBuildAdminSysLang
+		$this->triggerEvent('jcb_ce_onBeforeBuildAdminSysLang', array(&$this->langContent['adminsys'], &$this->langPrefix, &$componentName));
 		// check if the both admin array is set
 		if (isset($this->langContent['bothadmin']) && ComponentbuilderHelper::checkArray($this->langContent['bothadmin']))
 		{
@@ -6728,6 +6755,9 @@ class Interpretation extends Fields
 		}
 		if (isset($this->langContent['adminsys']) && ComponentbuilderHelper::checkArray($this->langContent['adminsys']))
 		{
+			// Trigger Event: jcb_ce_onAfterBuildAdminSysLang
+			$this->triggerEvent('jcb_ce_onAfterBuildAdminSysLang', array(&$this->langContent['adminsys'], &$this->langPrefix, &$componentName));
+			// sort strings
 			ksort($this->langContent['adminsys']);
 			// load to global languages
 			$this->languages[$this->langTag]['adminsys'] = $this->langContent['adminsys'];
@@ -13963,6 +13993,7 @@ class Interpretation extends Fields
 			// set the custom fields
 			if (isset($this->componentData->config) && ComponentbuilderHelper::checkArray($this->componentData->config))
 			{
+				// set component code name
 				$component = $this->componentCodeName;
 				$viewName = 'config';
 				$listViewName = 'configs';
@@ -13990,6 +14021,9 @@ class Interpretation extends Fields
 				$viewType = 0;
 				// set the custom table key
 				$dbkey = 'g';
+				// Trigger Event: jcb_ce_onBeforeSetConfigFieldsets
+				$this->triggerEvent('jcb_ce_onBeforeSetConfigFieldsets', array(&$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->componentData->config, &$this->extensionsParams, &$placeholders));
+				// build the config fields
 				foreach ($this->componentData->config as $field)
 				{
 					// check the field builder type
@@ -14043,6 +14077,8 @@ class Interpretation extends Fields
 		}
 		elseif (2 == $timer) // this is after the admin views are build
 		{
+			// Trigger Event: jcb_ce_onBeforeSetConfigFieldsets
+			$this->triggerEvent('jcb_ce_onBeforeSetConfigFieldsets', array(&$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->componentData->config, &$this->extensionsParams, &$this->placeholders));
 			// these field sets can only be added after admin view is build
 			$this->setGroupControlConfigFieldsets($lang);
 			// these can be added anytime really (but looks best after groups
@@ -14053,7 +14089,8 @@ class Interpretation extends Fields
 			// these are the coustom settings
 			$this->setCustomControlConfigFieldsets($lang);
 		}
-		// we can add more event (timers as we need)
+		// Trigger Event: jcb_ce_onAfterSetConfigFieldsets
+		$this->triggerEvent('jcb_ce_onAfterSetConfigFieldsets', array(&$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->extensionsParams, &$this->frontEndParams, &$this->placeholders));
 	}
 
 	public function setSiteControlConfigFieldsets($lang)
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 2ef43f93a..869cecd18 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -68,6 +68,9 @@ class Infusion extends Interpretation
 	{
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
+			// Trigger Event: jcb_ce_onBeforeBuildFilesContent
+			$this->triggerEvent('jcb_ce_onBeforeBuildFilesContent', array(&$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
+
 			// COMPONENT
 			$this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh] = $this->placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
 
@@ -231,6 +234,9 @@ class Infusion extends Interpretation
 				// set the target
 				$this->target = 'admin';
 				$this->lang = 'admin';
+				// reset
+				$viewName_single = '';
+				$viewName_list = '';
 
 				// set single view
 				if (isset($view['settings']->name_single))
@@ -269,6 +275,9 @@ class Infusion extends Interpretation
 					$this->setLockLicensePer($viewName_single, $this->target);
 					$this->setLockLicensePer($viewName_list, $this->target);
 
+					// Trigger Event: jcb_ce_onBeforeBuildAdminEditViewContent
+					$this->triggerEvent('jcb_ce_onBeforeBuildAdminEditViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_single], &$this->placeholders, &$this->hhh));
+
 					// FIELDSETS <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single][$this->hhh . 'FIELDSETS' . $this->hhh] = $this->setFieldSet($view, $this->componentCodeName, $viewName_single, $viewName_list);
 
@@ -367,6 +376,9 @@ class Infusion extends Interpretation
 							$this->fileContentDynamic[$viewName_single][$this->hhh . 'SITE_MENU_XML' . $this->hhh] = $this->setAdminViewMenu($viewName_single, $view);
 						}
 					}
+
+					// Trigger Event: jcb_ce_onAfterBuildAdminEditViewContent
+					$this->triggerEvent('jcb_ce_onAfterBuildAdminEditViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_single], &$this->placeholders, &$this->hhh));
 				}
 				// set the views names
 				if (isset($view['settings']->name_list) && $view['settings']->name_list != 'null')
@@ -376,6 +388,9 @@ class Infusion extends Interpretation
 					// ICOMOON <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list][$this->hhh . 'ICOMOON' . $this->hhh] = $view['icomoon'];
 
+					// Trigger Event: jcb_ce_onBeforeBuildAdminListViewContent
+					$this->triggerEvent('jcb_ce_onBeforeBuildAdminListViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_list], &$this->placeholders, &$this->hhh));
+
 					// set the export/import option
 					if (isset($view['port']) && $view['port'] || 1 == $view['settings']->add_custom_import)
 					{
@@ -505,6 +520,9 @@ class Infusion extends Interpretation
 					{
 						$this->fileContentDynamic[$viewName_list][$this->hhh . 'VIEWS_FOOTER_SCRIPT' . $this->hhh] = '';
 					}
+
+					// Trigger Event: jcb_ce_onAfterBuildAdminListViewContent
+					$this->triggerEvent('jcb_ce_onAfterBuildAdminListViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_list], &$this->placeholders, &$this->hhh));
 				}
 
 				// set u fields used in batch
@@ -585,6 +603,9 @@ class Infusion extends Interpretation
 				}
 				// HELPER_EXEL
 				$this->fileContentStatic[$this->hhh . 'HELPER_EXEL' . $this->hhh] = $this->setExelHelperMethods();
+
+				// Trigger Event: jcb_ce_onAfterBuildAdminViewContent
+				$this->triggerEvent('jcb_ce_onAfterBuildAdminViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
 			}
 
 			// setup custom_admin_views and all needed stuff for the site
@@ -592,7 +613,6 @@ class Infusion extends Interpretation
 			{
 				$this->target = 'custom_admin';
 				$this->lang = 'admin';
-				// var_dump($this->componentData->custom_admin_views);exit;
 				// start dynamic build
 				foreach ($this->componentData->custom_admin_views as $view)
 				{
@@ -630,6 +650,9 @@ class Infusion extends Interpretation
 					$this->placeholders[$this->bbb . 'sviews' . $this->ddd] = $view['settings']->code;
 					$this->placeholders[$this->bbb . 'SVIEWS' . $this->ddd] = $view['settings']->CODE;
 
+					// Trigger Event: jcb_ce_onBeforeBuildCustomAdminViewContent
+					$this->triggerEvent('jcb_ce_onBeforeBuildCustomAdminViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
+
 					// set license per view if needed
 					$this->setLockLicensePer($view['settings']->code, $this->target);
 
@@ -680,6 +703,9 @@ class Infusion extends Interpretation
 
 					// setup the templates
 					$this->setCustomViewTemplateBody($view);
+
+					// Trigger Event: jcb_ce_onAfterBuildCustomAdminViewContent
+					$this->triggerEvent('jcb_ce_onAfterBuildCustomAdminViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 				}
 
 				// setup the layouts
@@ -846,6 +872,9 @@ class Infusion extends Interpretation
 					$this->placeholders[$this->bbb . 'sviews' . $this->ddd] = $view['settings']->code;
 					$this->placeholders[$this->bbb . 'SVIEWS' . $this->ddd] = $view['settings']->CODE;
 
+					// Trigger Event: jcb_ce_onBeforeBuildSiteViewContent
+					$this->triggerEvent('jcb_ce_onBeforeBuildSiteViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
+
 					// set license per view if needed
 					$this->setLockLicensePer($view['settings']->code, $this->target);
 
@@ -926,6 +955,9 @@ class Infusion extends Interpretation
 					// set the site form if needed
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 1);
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 2);
+
+					// Trigger Event: jcb_ce_onAfterBuildSiteViewContent
+					$this->triggerEvent('jcb_ce_onAfterBuildSiteViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 				}
 				// setup the layouts
 				$this->setCustomViewLayouts();
@@ -1009,6 +1041,10 @@ class Infusion extends Interpretation
 			{
 				$this->fileContentStatic[$this->hhh . 'README' . $this->hhh] = $this->componentData->readme;
 			}
+
+			// Trigger Event: jcb_ce_onAfterBuildFilesContent
+			$this->triggerEvent('jcb_ce_onAfterBuildFilesContent', array(&$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
+
 			return true;
 		}
 		return false;
@@ -1136,6 +1172,9 @@ class Infusion extends Interpretation
 		// now we insert the values into the files
 		if (ComponentbuilderHelper::checkArray($this->languages))
 		{
+			// Trigger Event: jcb_ce_onBeforeBuildAllLangFiles
+			$this->triggerEvent('jcb_ce_onBeforeBuildAllLangFiles', array(&$this->languages, &$this->langTag));
+			// rest xml array
 			$langXML = array();
 			foreach ($this->languages as $tag => $areas)
 			{
@@ -1210,7 +1249,7 @@ class Infusion extends Interpretation
 					$langXML[$p][] = '<language tag="' . $tag . '">language/' . $tag . '/' . $fileName . '</language>';
 				}
 			}
-			// load the lang xml 
+			// load the lang xml
 			if (ComponentbuilderHelper::checkArray($langXML))
 			{
 				$replace = array();
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index e326f83e0..93a24ce12 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -2873,6 +2873,8 @@ COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION="Here you can set t
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_HINT="/home/user/compiler"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_LABEL="Compiler Folder Path"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_MESSAGE="Error! Please add some text here."
+COM_COMPONENTBUILDER_CONFIG_COMPILER_PLUGIN_DESCRIPTION="Select the plugin you would like to use in JCB's compiler"
+COM_COMPONENTBUILDER_CONFIG_COMPILER_PLUGIN_LABEL="Activate Compiler Plugins"
 COM_COMPONENTBUILDER_CONFIG_COMPONENT="Component"
 COM_COMPONENTBUILDER_CONFIG_COMPONENT_LABEL="Component"
 COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION="Here you can set the path to where all components are backed up to."
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index f51a2b074..6ad006031 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -1698,7 +1698,7 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `catid`, `description`, `name
 (34, '', 'Remember all views already have [accesslevel] added by default, only add this if you need more custom access selection! Provides a dropdown list of accesslevel options with the current option selected.', 'Accesslevel', '{\"properties0\":{\"name\":\"type\",\"example\":\"accesslevel\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be accesslevel\"},\"properties1\":{\"name\":\"name\",\"example\":\"accesstwo\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field. This must match the name of the query results column that contains the values that will be shown to the user in the drop-down list, unless a different name is specified in the value_field attribute. \"},\"properties2\":{\"name\":\"label\",\"example\":\"Access Two\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"description\",\"example\":\"Select an access level to this concept.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties4\":{\"name\":\"class\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field.\"},\"properties5\":{\"name\":\"required\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) is the field required true if yes.\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) If set to multiple then allows more than one usergroup to be selected.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'List of accesslevels', '', 1, 3, '', 5),
 (35, '', 'Provides a form with rows of fields that you specify. As many options can be added as desired. Note this form field has a jQuery based javascript file as a dependency.', 'Subform', '{\"properties0\":{\"name\":\"type\",\"example\":\"subform\",\"description\":\"(mandatory) must be subform.\"},\"properties1\":{\"name\":\"name\",\"example\":\"options\",\"adjustable\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter\"},\"properties2\":{\"name\":\"label\",\"example\":\"The Option List\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"layout\",\"example\":\"joomla.form.field.subform.repeatable-table\",\"adjustable\":\"1\",\"description\":\"(mandatory) The layout for the repeatable table.\"},\"properties4\":{\"name\":\"component\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) To change the component where it should search for layout\"},\"properties5\":{\"name\":\"client\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Function to initialise the application client<br \\/>Frontend: <code>site<\\/code> or <code>0<\\/code><br \\/>Backend: <code>admin<\\/code> or <code>1<\\/code>\"},\"properties6\":{\"name\":\"multiple\",\"example\":\"true\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) The rows to be multiple.\"},\"properties7\":{\"name\":\"buttons\",\"example\":\"add,remove,move\",\"adjustable\":\"1\",\"description\":\"(optional) Which buttons to show if multiple mode is true.<br \\/>Options: <code>add,remove,move<\\/code>\"},\"properties8\":{\"name\":\"fields\",\"example\":\"1,2,3\",\"adjustable\":\"1\",\"description\":\"(mandatory) The fields to add to the modal. All fields must first be created in component builder as a field before you can add them here, since you must use the id of the field. Separate the field ids with commas. Do not add custom fields that are not also used in this component.\"},\"properties9\":{\"name\":\"formsource\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) you can add a path to a xml file containing the fields.\"},\"properties10\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) description text for the form field. Displays at the top of the modal with the name as well as in the usual position in the form\"},\"properties11\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The default value for the form field if the field is left empty. Note this has to be a json string compatible with the contents of the form field.\"},\"properties12\":{\"name\":\"icon\",\"example\":\"list\",\"adjustable\":\"1\",\"description\":\"(optional) The icon to show on the select button (is prefixed with \\\"icon-\\\").\"},\"properties13\":{\"name\":\"max\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) The maximum number of rows of fields allowed (by default 999 to be effectively infinite)\"},\"properties14\":{\"name\":\"min\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) The minimum number of rows of fields required\"},\"properties15\":{\"name\":\"filter\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Use only if you would like to save raw data, since the default is best.\"},\"properties16\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'Allows form fields which can have as many options as the user desires.', '', 1, 13, '', 6),
 (36, '', 'Provides an input field for an email address.', 'Email', '{\"properties0\":{\"name\":\"type\",\"example\":\"email\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be email.\"},\"properties1\":{\"name\":\"name\",\"example\":\"email\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Email Address\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"size\",\"example\":\"10\",\"adjustable\":\"1\",\"description\":\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\"},\"properties4\":{\"name\":\"maxlength\",\"example\":\"50\",\"adjustable\":\"1\",\"description\":\"(optional) limits the number of characters that may be entered.\"},\"properties5\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties6\":{\"name\":\"description\",\"example\":\"Enter some description\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties7\":{\"name\":\"class\",\"example\":\"inputbox\",\"adjustable\":\"1\",\"description\":\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\"},\"properties8\":{\"name\":\"readonly\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value\"},\"properties9\":{\"name\":\"disabled\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\"},\"properties10\":{\"name\":\"required\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) The field must be filled before submitting the form.\"},\"properties11\":{\"name\":\"filter\",\"example\":\"STRING\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties12\":{\"name\":\"validate\",\"example\":\"email\",\"adjustable\":\"1\",\"description\":\"(optional) The validation method for the form field.  This value will determine which method is used to validate the value for a field.\"},\"properties13\":{\"name\":\"unique\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) Used in validation, to check if we should test for uniqueness, to insure that this email does not already belong to another user. Check line 99 in \\/libraries\\/src\\/Form\\/Rule\\/EmailRule.php\"},\"properties14\":{\"name\":\"field\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) used in validation of \\\"equals\\\" to link the field to match.\"},\"properties15\":{\"name\":\"message\",\"example\":\"Error! Please add some text here.\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The error message that will be displayed instead of the default message.\"},\"properties16\":{\"name\":\"hint\",\"example\":\"your@email.com\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) The placeholder to display inside the text box.\"},\"properties17\":{\"name\":\"autocomplete\",\"example\":\"on\",\"adjustable\":\"1\",\"description\":\"(optional) The autocomplete state for the form field.  If \'off\' element will not be automatically completed by browser.\"},\"properties18\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\"},\"properties19\":{\"name\":\"onchange\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) HTML equivalent attribute (javascript use)\"}}', 'Email form field type', '', 1, 6, '', 7),
-(37, '', 'Provides a dropdown list of plugin options from the folder.', 'Plugins', '{\"properties0\":{\"name\":\"type\",\"example\":\"plugins\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editors.\"},\"properties1\":{\"name\":\"name\",\"example\":\"editor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select an editor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties5\":{\"name\":\"folder\",\"example\":\"editors\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) editors or captcha.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"cmd\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'Provides a dropdown list of plugin options from the folder.', '', 1, 6, '', 8),
+(37, '', 'Provides a dropdown list of plugin options from the folder.', 'Plugins', '{\"properties0\":{\"name\":\"type\",\"example\":\"plugins\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be editors.\"},\"properties1\":{\"name\":\"name\",\"example\":\"editor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the parameter.\"},\"properties2\":{\"name\":\"label\",\"example\":\"Select an editor\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties3\":{\"name\":\"default\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) (not translatable) is the default value.\"},\"properties4\":{\"name\":\"description\",\"example\":\"\",\"adjustable\":\"1\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the label.\"},\"properties8\":{\"name\":\"multiple\",\"example\":\"false\",\"adjustable\":\"1\",\"description\":\"(optional) is whether multiple items can be selected at the same time (true or false).\"},\"properties5\":{\"name\":\"folder\",\"example\":\"editors\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) editors or captcha.\"},\"properties6\":{\"name\":\"filter\",\"example\":\"cmd\",\"adjustable\":\"1\",\"description\":\"(optional) allow the system to save certain html tags or raw data.\"},\"properties7\":{\"name\":\"showon\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional) show this field on the bases of the value in another field.\"}}', 'Provides a dropdown list of plugin options from the folder.', '', 1, 7, '', 8),
 (38, '', 'Provides the use of a captcha plugin.', 'Captcha', '{\"properties0\":{\"name\":\"type\",\"example\":\"captcha\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be captcha.\"},\"properties3\":{\"name\":\"name\",\"example\":\"captcha\",\"adjustable\":\"1\",\"mandatory\":\"1\",\"description\":\"(mandatory) is the unique name of the field.\"},\"properties2\":{\"name\":\"validate\",\"example\":\"captcha\",\"mandatory\":\"1\",\"description\":\"(mandatory) must be captcha.\"},\"properties1\":{\"name\":\"label\",\"example\":\"Captcha\",\"mandatory\":\"1\",\"translatable\":\"1\",\"description\":\"(mandatory) (translatable) is the descriptive title of the field.\"},\"properties4\":{\"name\":\"description\",\"example\":\"We do not like spam, please show us you are human\",\"translatable\":\"1\",\"description\":\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\"},\"properties5\":{\"name\":\"namespace\",\"example\":\"componentbuilder\",\"description\":\"(optional) the component name seems to work\"}}', 'Captcha robot check.', '', 1, 2, '', 9);
 
 --
diff --git a/componentbuilder.xml b/componentbuilder.xml
index c9bf94679..977f90557 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>18th June, 2019</creationDate>
+	<creationDate>22nd June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/site/router.php b/site/router.php
index 6b11fb53f..4f6145069 100644
--- a/site/router.php
+++ b/site/router.php
@@ -153,6 +153,8 @@ class ComponentbuilderRouter extends JComponentRouterBase
 		{
 			$getTable = '#__categories';
 			$query->from($db->quoteName($getTable));
+			// we need this to target the components categories (TODO will keep an eye on this)
+			$query->where($db->quoteName('extension') . ' LIKE '. $db->quote((string)'com_' . $main . '%'));
 		}
 		else
 		{
-- 
2.40.1


From 663f8405e5fcef12972d868c6c154c38237c8b57 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sat, 29 Jun 2019 23:11:37 +0200
Subject: [PATCH 22/26] Fixed gh-433 to allow ->value in the Value Key field on
 the where subform in the Tweak tab of the dynamicGet view.

---
 README.md                              | 2 +-
 admin/README.txt                       | 2 +-
 admin/helpers/compiler/a_Get.php       | 2 +-
 admin/helpers/compiler/b_Structure.php | 4 ++--
 admin/helpers/compiler/f_Infusion.php  | 1 -
 admin/models/forms/dynamic_get.xml     | 2 +-
 componentbuilder.xml                   | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 53a4587a1..3623fb829 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 22nd June, 2019
++ *Last Build*: 29th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index 53a4587a1..3623fb829 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,7 +146,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 22nd June, 2019
++ *Last Build*: 29th June, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index d257f2aac..0ee7b871d 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -905,7 +905,7 @@ class Get
 			// Get the dispatcher.
 			$dispatcher = \JEventDispatcher::getInstance();
 
-			// Trigger the form preparation event.
+			// Trigger this compiler event.
 			$results = $dispatcher->trigger($event, $data);
 
 			// Check for errors encountered while trigger the event
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index 71752637d..aeceafb9a 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -19,14 +19,14 @@ class Structure extends Get
 {
 
 	/**
-	 * The foulder counter
+	 * The folder counter
 	 * 
 	 * @var     int
 	 */
 	public $folderCount = 0;
 
 	/**
-	 * The foulder counter
+	 * The file counter
 	 * 
 	 * @var     int
 	 */
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 869cecd18..5457043a5 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -847,7 +847,6 @@ class Infusion extends Interpretation
 			if (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views))
 			{
 				$this->target = 'site';
-				// var_dump($this->componentData->site_views);exit;
 				// start dynamic build
 				foreach ($this->componentData->site_views as $view)
 				{
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index b82c8dc0e..3edb290cd 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -1162,7 +1162,7 @@
 					readonly="false"
 					disabled="false"
 					required="true"
-					filter="CMD"
+					filter="STRING"
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_VALUE_KEY_HINT"
 				/>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 977f90557..0bb88511e 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>22nd June, 2019</creationDate>
+	<creationDate>29th June, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From b9c758b800a6731c0438743108ab861a04112cf1 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Mon, 1 Jul 2019 18:10:28 +0200
Subject: [PATCH 23/26] Added context to all compiler events. Added layout
 fields override options for dynamic field generation.

---
 README.md                                     |   4 +-
 admin/README.txt                              |   4 +-
 admin/compiler/joomla_3/JModelAdmin.php       |  11 +-
 admin/compiler/joomla_3/JModelAdmin_site.php  |  11 +-
 admin/compiler/joomla_3/layout.php            |  15 +-
 admin/compiler/joomla_3/layoutfull.php        |  15 +-
 admin/compiler/joomla_3/layoutitems.php       |  15 +-
 admin/compiler/joomla_3/layoutpublished.php   |  15 +-
 admin/compiler/joomla_3/layouttitle.php       |  15 +-
 admin/helpers/compiler.php                    |   6 +-
 admin/helpers/compiler/a_Get.php              |  26 +--
 admin/helpers/compiler/b_Structure.php        |   4 +-
 admin/helpers/compiler/c_Fields.php           |  12 +-
 admin/helpers/compiler/e_Interpretation.php   |  62 +++++-
 admin/helpers/compiler/f_Infusion.php         |  27 +--
 .../layouts/admin_custom_tabs/publishing.php  |  15 +-
 .../layouts/admin_custom_tabs/publlshing.php  |  15 +-
 .../layouts/admin_custom_tabs/tabs_above.php  |  15 +-
 .../admin_custom_tabs/tabs_fullwidth.php      |  15 +-
 admin/layouts/admin_fields/fields_above.php   |  15 +-
 .../layouts/admin_fields/fields_fullwidth.php |  15 +-
 admin/layouts/admin_fields/publishing.php     |  15 +-
 admin/layouts/admin_fields/publlshing.php     |  15 +-
 .../conditions_above.php                      |  15 +-
 .../conditions_fullwidth.php                  |  15 +-
 .../admin_fields_conditions/publishing.php    |  15 +-
 .../admin_fields_conditions/publlshing.php    |  15 +-
 .../admin_fields_relations/publishing.php     |  15 +-
 .../admin_fields_relations/publlshing.php     |  15 +-
 .../relations_above.php                       |  15 +-
 .../relations_fullwidth.php                   |  15 +-
 admin/layouts/admin_view/css_fullwidth.php    |  15 +-
 .../admin_view/custom_buttons_fullwidth.php   |  15 +-
 .../admin_view/custom_buttons_left.php        |  15 +-
 .../admin_view/custom_import_fullwidth.php    |  15 +-
 admin/layouts/admin_view/details_above.php    |  15 +-
 .../layouts/admin_view/details_fullwidth.php  |  15 +-
 admin/layouts/admin_view/details_left.php     |  15 +-
 admin/layouts/admin_view/details_right.php    |  15 +-
 admin/layouts/admin_view/details_under.php    |  15 +-
 admin/layouts/admin_view/fields_fullwidth.php |  15 +-
 admin/layouts/admin_view/fields_left.php      |  15 +-
 admin/layouts/admin_view/fields_right.php     |  15 +-
 .../admin_view/javascript_fullwidth.php       |  15 +-
 admin/layouts/admin_view/mysql_fullwidth.php  |  15 +-
 admin/layouts/admin_view/mysql_left.php       |  15 +-
 admin/layouts/admin_view/php_fullwidth.php    |  15 +-
 admin/layouts/admin_view/publishing.php       |  15 +-
 admin/layouts/admin_view/publlshing.php       |  15 +-
 .../layouts/admin_view/settings_fullwidth.php |  15 +-
 .../component_admin_views/publishing.php      |  15 +-
 .../component_admin_views/publlshing.php      |  15 +-
 .../component_admin_views/views_above.php     |  15 +-
 .../component_admin_views/views_fullwidth.php |  15 +-
 admin/layouts/component_config/publishing.php |  15 +-
 admin/layouts/component_config/publlshing.php |  15 +-
 .../layouts/component_config/tweaks_above.php |  15 +-
 .../component_config/tweaks_fullwidth.php     |  15 +-
 .../publishing.php                            |  15 +-
 .../publlshing.php                            |  15 +-
 .../tweaks_above.php                          |  15 +-
 .../tweaks_fullwidth.php                      |  15 +-
 .../publishing.php                            |  15 +-
 .../publlshing.php                            |  15 +-
 .../views_above.php                           |  15 +-
 .../views_fullwidth.php                       |  15 +-
 .../component_dashboard/dashboard_above.php   |  15 +-
 .../dashboard_fullwidth.php                   |  15 +-
 .../component_dashboard/publishing.php        |  15 +-
 .../component_dashboard/publlshing.php        |  15 +-
 .../advance_fullwidth.php                     |  15 +-
 .../component_files_folders/basic_above.php   |  15 +-
 .../basic_fullwidth.php                       |  15 +-
 .../component_files_folders/publishing.php    |  15 +-
 .../component_files_folders/publlshing.php    |  15 +-
 .../component_mysql_tweaks/publishing.php     |  15 +-
 .../component_mysql_tweaks/publlshing.php     |  15 +-
 .../component_mysql_tweaks/tweaks_above.php   |  15 +-
 .../tweaks_fullwidth.php                      |  15 +-
 .../component_placeholders/details_above.php  |  15 +-
 .../details_fullwidth.php                     |  15 +-
 .../component_placeholders/publishing.php     |  15 +-
 .../component_placeholders/publlshing.php     |  15 +-
 .../component_site_views/publishing.php       |  15 +-
 .../component_site_views/publlshing.php       |  15 +-
 .../component_site_views/views_above.php      |  15 +-
 .../component_site_views/views_fullwidth.php  |  15 +-
 .../layouts/component_updates/publishing.php  |  15 +-
 .../layouts/component_updates/publlshing.php  |  15 +-
 .../component_updates/updates_above.php       |  15 +-
 .../component_updates/updates_fullwidth.php   |  15 +-
 .../custom_buttons_fullwidth.php              |  15 +-
 .../custom_admin_view/custom_buttons_left.php |  15 +-
 .../custom_admin_view/details_above.php       |  15 +-
 .../custom_admin_view/details_fullwidth.php   |  15 +-
 .../custom_admin_view/details_left.php        |  15 +-
 .../custom_admin_view/details_right.php       |  15 +-
 .../custom_admin_view/details_rightside.php   |  15 +-
 .../custom_admin_view/details_under.php       |  15 +-
 .../javascript_css_fullwidth.php              |  15 +-
 .../linked_components_fullwidth.php           |  15 +-
 .../custom_admin_view/php_fullwidth.php       |  15 +-
 .../layouts/custom_admin_view/publishing.php  |  15 +-
 .../layouts/custom_admin_view/publlshing.php  |  15 +-
 admin/layouts/custom_code/details_above.php   |  15 +-
 .../layouts/custom_code/details_fullwidth.php |  15 +-
 admin/layouts/custom_code/details_left.php    |  15 +-
 admin/layouts/custom_code/details_right.php   |  15 +-
 admin/layouts/custom_code/details_under.php   |  15 +-
 admin/layouts/custom_code/publishing.php      |  15 +-
 admin/layouts/custom_code/publlshing.php      |  15 +-
 .../layouts/dynamic_get/abacus_fullwidth.php  |  15 +-
 admin/layouts/dynamic_get/abacus_left.php     |  15 +-
 .../dynamic_get/custom_script_fullwidth.php   |  15 +-
 admin/layouts/dynamic_get/joint_fullwidth.php |  15 +-
 admin/layouts/dynamic_get/main_above.php      |  15 +-
 admin/layouts/dynamic_get/main_fullwidth.php  |  15 +-
 admin/layouts/dynamic_get/main_left.php       |  15 +-
 admin/layouts/dynamic_get/main_right.php      |  15 +-
 admin/layouts/dynamic_get/main_under.php      |  15 +-
 admin/layouts/dynamic_get/publishing.php      |  15 +-
 admin/layouts/dynamic_get/publlshing.php      |  15 +-
 admin/layouts/dynamic_get/tweak_fullwidth.php |  15 +-
 admin/layouts/field/database_fullwidth.php    |  15 +-
 admin/layouts/field/database_left.php         |  15 +-
 admin/layouts/field/database_right.php        |  15 +-
 admin/layouts/field/publishing.php            |  15 +-
 admin/layouts/field/publlshing.php            |  15 +-
 admin/layouts/field/scripts_left.php          |  15 +-
 admin/layouts/field/scripts_right.php         |  15 +-
 admin/layouts/field/set_properties_above.php  |  15 +-
 .../field/set_properties_fullwidth.php        |  15 +-
 admin/layouts/field/set_properties_under.php  |  15 +-
 admin/layouts/field/type_info_fullwidth.php   |  15 +-
 .../fieldtype/database_defaults_left.php      |  15 +-
 .../fieldtype/database_defaults_right.php     |  15 +-
 admin/layouts/fieldtype/details_above.php     |  15 +-
 admin/layouts/fieldtype/details_fullwidth.php |  15 +-
 admin/layouts/fieldtype/details_left.php      |  15 +-
 admin/layouts/fieldtype/details_right.php     |  15 +-
 admin/layouts/fieldtype/publishing.php        |  15 +-
 admin/layouts/fieldtype/publlshing.php        |  15 +-
 admin/layouts/help_document/details_above.php |  15 +-
 .../help_document/details_fullwidth.php       |  15 +-
 admin/layouts/help_document/details_left.php  |  15 +-
 admin/layouts/help_document/details_right.php |  15 +-
 admin/layouts/help_document/details_under.php |  15 +-
 admin/layouts/help_document/publishing.php    |  15 +-
 admin/layouts/help_document/publlshing.php    |  15 +-
 .../admin_views_fullwidth.php                 |  15 +-
 .../custom_admin_views_fullwidth.php          |  15 +-
 .../dash_install_fullwidth.php                |  15 +-
 .../joomla_component/dash_install_left.php    |  15 +-
 .../joomla_component/dash_install_right.php   |  15 +-
 .../joomla_component/details_above.php        |  15 +-
 .../layouts/joomla_component/details_left.php |  15 +-
 .../joomla_component/details_right.php        |  15 +-
 .../joomla_component/details_under.php        |  15 +-
 .../dynamic_build_beta_fullwidth.php          |  15 +-
 .../dynamic_integration_left.php              |  15 +-
 .../dynamic_integration_right.php             |  15 +-
 .../libs_helpers_fullwidth.php                |  15 +-
 .../joomla_component/mysql_fullwidth.php      |  15 +-
 admin/layouts/joomla_component/publishing.php |  15 +-
 .../layouts/joomla_component/readme_left.php  |  15 +-
 .../layouts/joomla_component/readme_right.php |  15 +-
 .../joomla_component/settings_fullwidth.php   |  15 +-
 .../joomla_component/settings_left.php        |  15 +-
 .../joomla_component/settings_right.php       |  15 +-
 .../joomla_component/site_views_fullwidth.php |  15 +-
 admin/layouts/language/details_left.php       |  15 +-
 admin/layouts/language/details_right.php      |  15 +-
 admin/layouts/language/publishing.php         |  15 +-
 admin/layouts/language/publlshing.php         |  15 +-
 .../details_fullwidth.php                     |  15 +-
 .../language_translation/publishing.php       |  15 +-
 .../language_translation/publlshing.php       |  15 +-
 .../layout/custom_script_fullwidth.php        |  15 +-
 admin/layouts/layout/details_fullwidth.php    |  15 +-
 admin/layouts/layout/details_left.php         |  15 +-
 admin/layouts/layout/details_right.php        |  15 +-
 admin/layouts/layout/details_rightside.php    |  15 +-
 admin/layouts/layout/details_under.php        |  15 +-
 admin/layouts/layout/publishing.php           |  15 +-
 admin/layouts/layout/publlshing.php           |  15 +-
 admin/layouts/library/behaviour_above.php     |  15 +-
 admin/layouts/library/behaviour_fullwidth.php |  15 +-
 admin/layouts/library/behaviour_left.php      |  15 +-
 admin/layouts/library/behaviour_right.php     |  15 +-
 admin/layouts/library/behaviour_under.php     |  15 +-
 admin/layouts/library/config_fullwidth.php    |  15 +-
 .../library/files_folders_urls_fullwidth.php  |  15 +-
 admin/layouts/library/linked_fullwidth.php    |  15 +-
 admin/layouts/library/publishing.php          |  15 +-
 admin/layouts/library/publlshing.php          |  15 +-
 admin/layouts/library_config/publishing.php   |  15 +-
 admin/layouts/library_config/publlshing.php   |  15 +-
 admin/layouts/library_config/tweaks_above.php |  15 +-
 .../library_config/tweaks_fullwidth.php       |  15 +-
 .../advance_fullwidth.php                     |  15 +-
 .../basic_above.php                           |  15 +-
 .../basic_fullwidth.php                       |  15 +-
 .../library_files_folders_urls/publishing.php |  15 +-
 .../library_files_folders_urls/publlshing.php |  15 +-
 .../layouts/placeholder/details_fullwidth.php |  15 +-
 admin/layouts/placeholder/details_left.php    |  15 +-
 admin/layouts/placeholder/details_right.php   |  15 +-
 admin/layouts/placeholder/publishing.php      |  15 +-
 admin/layouts/placeholder/publlshing.php      |  15 +-
 admin/layouts/server/details_above.php        |  15 +-
 admin/layouts/server/details_fullwidth.php    |  15 +-
 admin/layouts/server/details_left.php         |  15 +-
 admin/layouts/server/details_right.php        |  15 +-
 admin/layouts/server/publishing.php           |  15 +-
 admin/layouts/server/publlshing.php           |  15 +-
 .../site_view/custom_buttons_fullwidth.php    |  15 +-
 .../layouts/site_view/custom_buttons_left.php |  15 +-
 .../site_view/custom_buttons_right.php        |  15 +-
 admin/layouts/site_view/details_above.php     |  15 +-
 admin/layouts/site_view/details_fullwidth.php |  15 +-
 admin/layouts/site_view/details_left.php      |  15 +-
 admin/layouts/site_view/details_right.php     |  15 +-
 admin/layouts/site_view/details_rightside.php |  15 +-
 admin/layouts/site_view/details_under.php     |  15 +-
 .../site_view/javascript_css_fullwidth.php    |  15 +-
 .../site_view/linked_components_fullwidth.php |  15 +-
 admin/layouts/site_view/php_fullwidth.php     |  15 +-
 admin/layouts/site_view/publishing.php        |  15 +-
 admin/layouts/site_view/publlshing.php        |  15 +-
 .../layouts/snippet/contributor_fullwidth.php |  15 +-
 admin/layouts/snippet/contributor_left.php    |  15 +-
 admin/layouts/snippet/contributor_right.php   |  15 +-
 admin/layouts/snippet/details_above.php       |  15 +-
 admin/layouts/snippet/details_left.php        |  15 +-
 admin/layouts/snippet/details_right.php       |  15 +-
 admin/layouts/snippet/publishing.php          |  15 +-
 admin/layouts/snippet/publlshing.php          |  15 +-
 admin/layouts/snippet_type/details_left.php   |  15 +-
 admin/layouts/snippet_type/details_right.php  |  15 +-
 admin/layouts/snippet_type/publishing.php     |  15 +-
 admin/layouts/snippet_type/publlshing.php     |  15 +-
 .../template/custom_script_fullwidth.php      |  15 +-
 admin/layouts/template/details_fullwidth.php  |  15 +-
 admin/layouts/template/details_left.php       |  15 +-
 admin/layouts/template/details_right.php      |  15 +-
 admin/layouts/template/details_rightside.php  |  15 +-
 admin/layouts/template/details_under.php      |  15 +-
 admin/layouts/template/publishing.php         |  15 +-
 admin/layouts/template/publlshing.php         |  15 +-
 .../extends_formrule_above.php                |  15 +-
 .../extends_formrule_fullwidth.php            |  15 +-
 .../validation_rule/extends_formrule_left.php |  15 +-
 .../extends_formrule_right.php                |  15 +-
 admin/layouts/validation_rule/publishing.php  |  15 +-
 admin/layouts/validation_rule/publlshing.php  |  15 +-
 admin/models/admin_custom_tabs.php            |  20 +-
 admin/models/admin_fields.php                 |  21 +-
 admin/models/admin_fields_conditions.php      |  21 +-
 admin/models/admin_fields_relations.php       |  21 +-
 admin/models/admin_view.php                   | 167 ++++++++++++++-
 admin/models/component_admin_views.php        |  21 +-
 admin/models/component_config.php             |  20 +-
 admin/models/component_custom_admin_menus.php |  20 +-
 admin/models/component_custom_admin_views.php |  21 +-
 admin/models/component_dashboard.php          |  21 +-
 admin/models/component_files_folders.php      |  32 ++-
 admin/models/component_mysql_tweaks.php       |  20 +-
 admin/models/component_placeholders.php       |  20 +-
 admin/models/component_site_views.php         |  21 +-
 admin/models/component_updates.php            |  20 +-
 admin/models/custom_admin_view.php            |  86 +++++++-
 admin/models/custom_code.php                  |  39 +++-
 admin/models/dynamic_get.php                  |  79 +++++++-
 admin/models/field.php                        |  65 +++++-
 admin/models/fieldtype.php                    |  45 ++++-
 admin/models/help_document.php                |  36 +++-
 admin/models/joomla_component.php             | 190 +++++++++++++++++-
 admin/models/language.php                     |  20 +-
 admin/models/language_translation.php         |  19 +-
 admin/models/layout.php                       |  43 +++-
 admin/models/library.php                      |  56 +++++-
 admin/models/library_config.php               |  20 +-
 admin/models/library_files_folders_urls.php   |  34 +++-
 admin/models/placeholder.php                  |  23 ++-
 admin/models/server.php                       |  37 +++-
 admin/models/site_view.php                    |  89 +++++++-
 admin/models/snippet.php                      |  41 +++-
 admin/models/snippet_type.php                 |  20 +-
 admin/models/template.php                     |  43 +++-
 admin/models/validation_rule.php              |  26 ++-
 componentbuilder.xml                          |   2 +-
 291 files changed, 4951 insertions(+), 370 deletions(-)

diff --git a/README.md b/README.md
index 3623fb829..19b30191e 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th June, 2019
++ *Last Build*: 1st July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206973**
++ *Line count*: **211430**
 + *Field count*: **1142**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 3623fb829..19b30191e 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th June, 2019
++ *Last Build*: 1st July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **206973**
++ *Line count*: **211430**
 + *Field count*: **1142**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/compiler/joomla_3/JModelAdmin.php b/admin/compiler/joomla_3/JModelAdmin.php
index 46d024f0d..f939f76db 100644
--- a/admin/compiler/joomla_3/JModelAdmin.php
+++ b/admin/compiler/joomla_3/JModelAdmin.php
@@ -23,13 +23,20 @@ use Joomla\Registry\Registry;
  * ###Component### ###View### Model
  */
 class ###Component###Model###View### extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = ###TABLAYOUTFIELDSARRAY###;
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_###COMPONENT###';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/compiler/joomla_3/JModelAdmin_site.php b/admin/compiler/joomla_3/JModelAdmin_site.php
index 46d024f0d..f939f76db 100644
--- a/admin/compiler/joomla_3/JModelAdmin_site.php
+++ b/admin/compiler/joomla_3/JModelAdmin_site.php
@@ -23,13 +23,20 @@ use Joomla\Registry\Registry;
  * ###Component### ###View### Model
  */
 class ###Component###Model###View### extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = ###TABLAYOUTFIELDSARRAY###;
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_###COMPONENT###';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/compiler/joomla_3/layout.php b/admin/compiler/joomla_3/layout.php
index 5b6acbb3c..fb87860a0 100644
--- a/admin/compiler/joomla_3/layout.php
+++ b/admin/compiler/joomla_3/layout.php
@@ -29,18 +29,31 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	###LAYOUTITEMS###
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/compiler/joomla_3/layoutfull.php b/admin/compiler/joomla_3/layoutfull.php
index bf7b64e02..9f09f4660 100644
--- a/admin/compiler/joomla_3/layoutfull.php
+++ b/admin/compiler/joomla_3/layoutfull.php
@@ -17,15 +17,27 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	###LAYOUTITEMS###
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -34,3 +46,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/compiler/joomla_3/layoutitems.php b/admin/compiler/joomla_3/layoutitems.php
index 82de7a208..ae2f5a5c0 100644
--- a/admin/compiler/joomla_3/layoutitems.php
+++ b/admin/compiler/joomla_3/layoutitems.php
@@ -17,18 +17,31 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	###LAYOUTITEMS###
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/compiler/joomla_3/layoutpublished.php b/admin/compiler/joomla_3/layoutpublished.php
index 82de7a208..ae2f5a5c0 100644
--- a/admin/compiler/joomla_3/layoutpublished.php
+++ b/admin/compiler/joomla_3/layoutpublished.php
@@ -17,18 +17,31 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	###LAYOUTITEMS###
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/compiler/joomla_3/layouttitle.php b/admin/compiler/joomla_3/layouttitle.php
index 5c30a679f..dd1a0e772 100644
--- a/admin/compiler/joomla_3/layouttitle.php
+++ b/admin/compiler/joomla_3/layouttitle.php
@@ -17,15 +17,27 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	###LAYOUTITEMS###
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -34,3 +46,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php
index 96a740dd2..94a26fdbb 100644
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@@ -254,7 +254,7 @@ class Compiler extends Infusion
 	protected function setFileContent(&$name, &$path, &$bom, $view = null)
 	{
 		// Trigger Event: jcb_ce_onBeforeSetFileContent
-		$this->triggerEvent('jcb_ce_onBeforeSetFileContent', array(&$name, &$path, &$bom, &$view));
+		$this->triggerEvent('jcb_ce_onBeforeSetFileContent', array(&$this->componentContext, &$name, &$path, &$bom, &$view));
 		// set the file name
 		$this->fileContentStatic[$this->hhh . 'FILENAME' . $this->hhh] = $name;
 		// check if the file should get PHP opening
@@ -266,7 +266,7 @@ class Compiler extends Infusion
 		// get content of the file
 		$string = ComponentbuilderHelper::getFileContents($path);
 		// Trigger Event: jcb_ce_onGetFileContents
-		$this->triggerEvent('jcb_ce_onGetFileContents', array(&$string, &$name, &$path, &$bom, &$view));
+		$this->triggerEvent('jcb_ce_onGetFileContents', array(&$this->componentContext, &$string, &$name, &$path, &$bom, &$view));
 		// see if we should add a BOM
 		if (strpos($string, $this->hhh . 'BOM' . $this->hhh) !== false)
 		{
@@ -286,7 +286,7 @@ class Compiler extends Infusion
 			$answer = $this->setDynamicValues($answer);
 		}
 		// Trigger Event: jcb_ce_onBeforeSetFileContent
-		$this->triggerEvent('jcb_ce_onBeforeWriteFileContent', array(&$answer, &$name, &$path, &$bom, &$view));
+		$this->triggerEvent('jcb_ce_onBeforeWriteFileContent', array(&$this->componentContext, &$answer, &$name, &$path, &$bom, &$view));
 		// add answer back to file
 		$this->writeFile($path, $answer);
 		// count the file lines
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 0ee7b871d..61c84de40 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -800,6 +800,8 @@ class Get
 				$this->langPrefix = 'COM_' . ComponentbuilderHelper::safeString($name_code, 'U');
 				// set component code name
 				$this->componentCodeName = ComponentbuilderHelper::safeString($name_code);
+				// set component context
+				$this->componentContext = $this->componentCodeName . '.' . $this->componentID;
 				// set if placeholders should be added to customcode
 				$global = ((int) ComponentbuilderHelper::getVar('joomla_component', $this->componentID, 'id', 'add_placeholders') == 1) ? true : false;
 				$this->addPlaceholders = ((int) $config['placeholders'] == 0) ? false : (((int) $config['placeholders'] == 1) ? true : $global);
@@ -1020,7 +1022,7 @@ class Get
 		$query->where($this->db->quoteName('a.id') . ' = ' . (int) $this->componentID);
 
 		// Trigger Event: jcb_ce_onBeforeQueryComponentData
-		$this->triggerEvent('jcb_ce_onBeforeQueryComponentData', array(&$this->componentID, &$query, &$this->db));
+		$this->triggerEvent('jcb_ce_onBeforeQueryComponentData', array(&$this->componentContext, &$this->componentID, &$query, &$this->db));
 
 		// Reset the query using our newly populated query object.
 		$this->db->setQuery($query);
@@ -1029,7 +1031,7 @@ class Get
 		$component = $this->db->loadObject();
 
 		// Trigger Event: jcb_ce_onBeforeModelComponentData
-		$this->triggerEvent('jcb_ce_onBeforeModelComponentData', array(&$component));
+		$this->triggerEvent('jcb_ce_onBeforeModelComponentData', array(&$this->componentContext, &$component));
 
 		// set upater
 		$updater = array(
@@ -1573,7 +1575,7 @@ class Get
 		}
 
 		// Trigger Event: jcb_ce_onAfterModelComponentData
-		$this->triggerEvent('jcb_ce_onAfterModelComponentData', array(&$component));
+		$this->triggerEvent('jcb_ce_onAfterModelComponentData', array(&$this->componentContext, &$component));
 
 		// return the found component data
 		return $component;
@@ -1622,7 +1624,7 @@ class Get
 			$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
 
 			// Trigger Event: jcb_ce_onBeforeQueryViewData
-			$this->triggerEvent('jcb_ce_onBeforeQueryViewData', array(&$id, &$query, &$this->db));
+			$this->triggerEvent('jcb_ce_onBeforeQueryViewData', array(&$this->componentContext, &$id, &$query, &$this->db));
 
 			// Reset the query using our newly populated query object.
 			$this->db->setQuery($query);
@@ -1681,7 +1683,7 @@ class Get
 			$this->placeholders[$this->bbb . 'VIEWS' . $this->ddd] = $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh];
 
 			// Trigger Event: jcb_ce_onBeforeModelViewData
-			$this->triggerEvent('jcb_ce_onBeforeModelViewData', array(&$view, &$this->placeholders));
+			$this->triggerEvent('jcb_ce_onBeforeModelViewData', array(&$this->componentContext, &$view, &$this->placeholders));
 
 			// add the tables
 			$view->addtables = (isset($view->addtables) && ComponentbuilderHelper::checkJson($view->addtables)) ? json_decode($view->addtables, true) : null;
@@ -2279,7 +2281,7 @@ class Get
 			}
 
 			// Trigger Event: jcb_ce_onAfterModelViewData
-			$this->triggerEvent('jcb_ce_onAfterModelViewData', array(&$view, &$this->placeholders));
+			$this->triggerEvent('jcb_ce_onAfterModelViewData', array(&$this->componentContext, &$view, &$this->placeholders));
 
 			// clear placeholders
 			unset($this->placeholders[$this->hhh . 'view' . $this->hhh]);
@@ -2321,7 +2323,7 @@ class Get
 		$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
 
 		// Trigger Event: jcb_ce_onBeforeQueryCustomViewData
-		$this->triggerEvent('jcb_ce_onBeforeQueryCustomViewData', array(&$id, &$table, &$query, &$this->db));
+		$this->triggerEvent('jcb_ce_onBeforeQueryCustomViewData', array(&$this->componentContext, &$id, &$table, &$query, &$this->db));
 
 		// Reset the query using our newly populated query object.
 		$this->db->setQuery($query);
@@ -2330,7 +2332,7 @@ class Get
 		$view = $this->db->loadObject();
 
 		// Trigger Event: jcb_ce_onBeforeModelCustomViewData
-		$this->triggerEvent('jcb_ce_onBeforeModelCustomViewData', array(&$view, &$id, &$table));
+		$this->triggerEvent('jcb_ce_onBeforeModelCustomViewData', array(&$this->componentContext, &$view, &$id, &$table));
 
 		if ($table === 'site_view')
 		{
@@ -2570,7 +2572,7 @@ class Get
 		}
 
 		// Trigger Event: jcb_ce_onAfterModelCustomViewData
-		$this->triggerEvent('jcb_ce_onAfterModelCustomViewData', array(&$view));
+		$this->triggerEvent('jcb_ce_onAfterModelCustomViewData', array(&$this->componentContext, &$view));
 
 		// return the found view data
 		return $view;
@@ -2601,7 +2603,7 @@ class Get
 			$query->where($this->db->quoteName('a.id') . ' = ' . $this->db->quote($id));
 
 			// Trigger Event: jcb_ce_onBeforeQueryFieldData
-			$this->triggerEvent('jcb_ce_onBeforeQueryFieldData', array(&$id, &$query, &$this->db));
+			$this->triggerEvent('jcb_ce_onBeforeQueryFieldData', array(&$this->componentContext, &$id, &$query, &$this->db));
 
 			// Reset the query using our newly populated query object.
 			$this->db->setQuery($query);
@@ -2612,7 +2614,7 @@ class Get
 				$field = $this->db->loadObject();
 
 				// Trigger Event: jcb_ce_onBeforeModelFieldData
-				$this->triggerEvent('jcb_ce_onBeforeModelFieldData', array(&$field));
+				$this->triggerEvent('jcb_ce_onBeforeModelFieldData', array(&$this->componentContext, &$field));
 
 				// adding a fix for the changed name of type to fieldtype
 				$field->type = $field->fieldtype;
@@ -2690,7 +2692,7 @@ class Get
 				$field->history = $this->getHistoryWatch('field', $id);
 
 				// Trigger Event: jcb_ce_onAfterModelFieldData
-				$this->triggerEvent('jcb_ce_onAfterModelFieldData', array(&$field));
+				$this->triggerEvent('jcb_ce_onAfterModelFieldData', array(&$this->componentContext, &$field));
 
 				$this->_fieldData[$id] = $field;
 			}
diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php
index aeceafb9a..d8ef5e2ef 100644
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@@ -368,7 +368,7 @@ class Structure extends Get
 			// set the Joomla Version Data
 			$this->joomlaVersionData = $this->setJoomlaVersionData();
 			// Trigger Event: jcb_ce_onAfterSetJoomlaVersionData
-			$this->triggerEvent('jcb_ce_onAfterSetJoomlaVersionData', array(&$this->joomlaVersionData));
+			$this->triggerEvent('jcb_ce_onAfterSetJoomlaVersionData', array(&$this->componentContext, &$this->joomlaVersionData));
 			// set the dashboard
 			$this->setDynamicDashboard();
 			// set the new folders
@@ -419,7 +419,7 @@ class Structure extends Get
 		if (ComponentbuilderHelper::checkArray($this->libraries))
 		{
 			// Trigger Event: jcb_ce_onBeforeSetLibaries
-			$this->triggerEvent('jcb_ce_onBeforeSetLibaries', array(&$this->libraries));
+			$this->triggerEvent('jcb_ce_onBeforeSetLibaries', array(&$this->componentContext, &$this->libraries));
 			// creat the main component folder
 			if (!JFolder::exists($this->componentPath))
 			{
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index ae9178e61..c3a411af7 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -457,14 +457,14 @@ class Fields extends Structure
 		// set the custom table key
 		$dbkey = 'g';
 		// Trigger Event: jcb_ce_onBeforeBuildFields
-		$this->triggerEvent('jcb_ce_onBeforeBuildFields', array(&$dynamicFields, &$readOnly, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
+		$this->triggerEvent('jcb_ce_onBeforeBuildFields', array(&$this->componentContext, &$dynamicFields, &$readOnly, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// TODO we should add the global and local view switch if field for front end
 		foreach ($view['settings']->fields as $field)
 		{
 			$dynamicFields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $view_name_single, $view_name_list, $this->placeholders, $dbkey, true);
 		}
 		// Trigger Event: jcb_ce_onAfterBuildFields
-		$this->triggerEvent('jcb_ce_onAfterBuildFields', array(&$dynamicFields, &$readOnly, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
+		$this->triggerEvent('jcb_ce_onAfterBuildFields', array(&$this->componentContext, &$dynamicFields, &$readOnly, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// set the default fields
 		$fieldSet = array();
 		$fieldSet[] = '<fieldset name="details">';
@@ -729,14 +729,14 @@ class Fields extends Structure
 		// set the custom table key
 		$dbkey = 'g';
 		// Trigger Event: jcb_ce_onBeforeBuildFields
-		$this->triggerEvent('jcb_ce_onBeforeBuildFields', array(&$dynamicFieldsXML, &$readOnlyXML, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
+		$this->triggerEvent('jcb_ce_onBeforeBuildFields', array(&$this->componentContext, &$dynamicFieldsXML, &$readOnlyXML, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// TODO we should add the global and local view switch if field for front end
 		foreach ($view['settings']->fields as $field)
 		{
 			$dynamicFieldsXML[] = $this->setDynamicField($field, $view, $view['settings']->type, $langView, $view_name_single, $view_name_list, $this->placeholders, $dbkey, true);
 		}
 		// Trigger Event: jcb_ce_onAfterBuildFields
-		$this->triggerEvent('jcb_ce_onAfterBuildFields', array(&$dynamicFieldsXML, &$readOnlyXML, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
+		$this->triggerEvent('jcb_ce_onAfterBuildFields', array(&$this->componentContext, &$dynamicFieldsXML, &$readOnlyXML, &$dbkey, &$view, &$component, &$view_name_single, &$view_name_list, &$this->placeholders, &$langView, &$langViews));
 		// set the default fields
 		$XML = new simpleXMLElement('<a/>');
 		$fieldSetXML = $XML->addChild('fieldset');
@@ -2013,7 +2013,7 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$view_name_single][$tabName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
-			// check if publishing fields were over written
+			// check if default fields were over written
 			if (in_array($name, $this->defaultFields))
 			{
 				// just to eliminate
@@ -2055,7 +2055,7 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$view_name_single]['Details'][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
-			// check if publishing fields were over written
+			// check if default fields were over written
 			if (in_array($name, $this->defaultFields))
 			{
 				// just to eliminate
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 33ebf3baf..0dcdffe72 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -6539,7 +6539,7 @@ class Interpretation extends Fields
 		// add final list of needed lang strings
 		$componentName = JFilterOutput::cleanText($this->componentData->name);
 		// Trigger Event: jcb_ce_onBeforeBuildAdminLang
-		$this->triggerEvent('jcb_ce_onBeforeBuildAdminLang', array(&$this->langContent['admin'], &$this->langPrefix, &$componentName));
+		$this->triggerEvent('jcb_ce_onBeforeBuildAdminLang', array(&$this->componentContext, &$this->langContent['admin'], &$this->langPrefix, &$componentName));
 		// start loding the defaults
 		$this->langContent['adminsys'][$this->langPrefix] = $componentName;
 		$this->langContent['adminsys'][$this->langPrefix . '_CONFIGURATION'] = $componentName . ' Configuration';
@@ -6631,7 +6631,7 @@ class Interpretation extends Fields
 		if (isset($this->langContent['admin']) && ComponentbuilderHelper::checkArray($this->langContent['admin']))
 		{
 			// Trigger Event: jcb_ce_onAfterBuildAdminLang
-			$this->triggerEvent('jcb_ce_onAfterBuildAdminLang', array(&$this->langContent['admin'], &$this->langPrefix, &$componentName));
+			$this->triggerEvent('jcb_ce_onAfterBuildAdminLang', array(&$this->componentContext, &$this->langContent['admin'], &$this->langPrefix, &$componentName));
 			// sort the strings
 			ksort($this->langContent['admin']);
 			// load to global languages
@@ -6649,7 +6649,7 @@ class Interpretation extends Fields
 		// add final list of needed lang strings
 		$componentName = JFilterOutput::cleanText($this->componentData->name);
 		// Trigger Event: jcb_ce_onBeforeBuildSiteLang
-		$this->triggerEvent('jcb_ce_onBeforeBuildSiteLang', array(&$this->langContent['site'], &$this->langPrefix, &$componentName));
+		$this->triggerEvent('jcb_ce_onBeforeBuildSiteLang', array(&$this->componentContext, &$this->langContent['site'], &$this->langPrefix, &$componentName));
 		// add final list of needed lang strings
 		$this->langContent['site'][$this->langPrefix] = $componentName;
 		// some more defaults
@@ -6691,7 +6691,7 @@ class Interpretation extends Fields
 		if (isset($this->langContent['site']) && ComponentbuilderHelper::checkArray($this->langContent['site']))
 		{
 			// Trigger Event: jcb_ce_onAfterBuildSiteLang
-			$this->triggerEvent('jcb_ce_onAfterBuildSiteLang', array(&$this->langContent['site'], &$this->langPrefix, &$componentName));
+			$this->triggerEvent('jcb_ce_onAfterBuildSiteLang', array(&$this->componentContext, &$this->langContent['site'], &$this->langPrefix, &$componentName));
 			// sort the strings
 			ksort($this->langContent['site']);
 			// load to global languages
@@ -6709,7 +6709,7 @@ class Interpretation extends Fields
 		// add final list of needed lang strings
 		$componentName = JFilterOutput::cleanText($this->componentData->name);
 		// Trigger Event: jcb_ce_onBeforeBuildSiteSysLang
-		$this->triggerEvent('jcb_ce_onBeforeBuildSiteSysLang', array(&$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
+		$this->triggerEvent('jcb_ce_onBeforeBuildSiteSysLang', array(&$this->componentContext, &$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
 		// add final list of needed lang strings
 		$this->langContent['sitesys'][$this->langPrefix] = $componentName;
 		$this->langContent['sitesys'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
@@ -6726,7 +6726,7 @@ class Interpretation extends Fields
 		if (isset($this->langContent['sitesys']) && ComponentbuilderHelper::checkArray($this->langContent['sitesys']))
 		{
 			// Trigger Event: jcb_ce_onAfterBuildSiteSysLang
-			$this->triggerEvent('jcb_ce_onAfterBuildSiteSysLang', array(&$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
+			$this->triggerEvent('jcb_ce_onAfterBuildSiteSysLang', array(&$this->componentContext, &$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
 			// sort strings
 			ksort($this->langContent['sitesys']);
 			// load to global languages
@@ -6744,7 +6744,7 @@ class Interpretation extends Fields
 		// add final list of needed lang strings
 		$componentName = JFilterOutput::cleanText($this->componentData->name);
 		// Trigger Event: jcb_ce_onBeforeBuildAdminSysLang
-		$this->triggerEvent('jcb_ce_onBeforeBuildAdminSysLang', array(&$this->langContent['adminsys'], &$this->langPrefix, &$componentName));
+		$this->triggerEvent('jcb_ce_onBeforeBuildAdminSysLang', array(&$this->componentContext, &$this->langContent['adminsys'], &$this->langPrefix, &$componentName));
 		// check if the both admin array is set
 		if (isset($this->langContent['bothadmin']) && ComponentbuilderHelper::checkArray($this->langContent['bothadmin']))
 		{
@@ -6756,7 +6756,7 @@ class Interpretation extends Fields
 		if (isset($this->langContent['adminsys']) && ComponentbuilderHelper::checkArray($this->langContent['adminsys']))
 		{
 			// Trigger Event: jcb_ce_onAfterBuildAdminSysLang
-			$this->triggerEvent('jcb_ce_onAfterBuildAdminSysLang', array(&$this->langContent['adminsys'], &$this->langPrefix, &$componentName));
+			$this->triggerEvent('jcb_ce_onAfterBuildAdminSysLang', array(&$this->componentContext, &$this->langContent['adminsys'], &$this->langPrefix, &$componentName));
 			// sort strings
 			ksort($this->langContent['adminsys']);
 			// load to global languages
@@ -7482,6 +7482,46 @@ class Interpretation extends Fields
 		return '';
 	}
 
+	/**
+	 * set Tabs Layouts Fields Array
+	 *
+	 * @param   string   $view_name_single  The single view name
+	 *
+	 * @return  string   The array
+	 *
+	 */
+	public function getTabLayoutFieldsArray($view_name_single)
+	{
+		// check if the load build is set for this view
+		if (isset($this->layoutBuilder[$view_name_single]) && ComponentbuilderHelper::checkArray($this->layoutBuilder[$view_name_single]))
+		{
+			$layoutArray = array();
+			foreach ($this->layoutBuilder[$view_name_single] as $layout => $alignments)
+			{
+				// sort the alignments
+				ksort($alignments);
+				$alignmentArray= array();
+				foreach ($alignments as $alignment => $fields)
+				{
+					// sort the fields
+					ksort($fields);
+					$fieldArray= array();
+					foreach ($fields as $field)
+					{
+						// add each field
+						$fieldArray[] = PHP_EOL . $this->_t(4) . "'" . $field . "'";
+					}
+					// add the alignemnt key
+					$alignmentArray[] = PHP_EOL . $this->_t(3) . "'" . $this->alignmentOptions[$alignment] . "' => array(" . implode(',', $fieldArray) . PHP_EOL . $this->_t(3) . ")";
+				}
+				// add the layout key
+				$layoutArray[] = PHP_EOL . $this->_t(2) . "'" . ComponentbuilderHelper::safeString($layout) . "' => array(" . implode(',', $alignmentArray) . PHP_EOL . $this->_t(2) . ")";
+			}
+			return 'array(' . implode(',', $layoutArray) . PHP_EOL . $this->_t(1) . ")";
+		}
+		return 'array()';
+	}
+
 	/**
 	 * set Edit Body
 	 *
@@ -14022,7 +14062,7 @@ class Interpretation extends Fields
 				// set the custom table key
 				$dbkey = 'g';
 				// Trigger Event: jcb_ce_onBeforeSetConfigFieldsets
-				$this->triggerEvent('jcb_ce_onBeforeSetConfigFieldsets', array(&$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->componentData->config, &$this->extensionsParams, &$placeholders));
+				$this->triggerEvent('jcb_ce_onBeforeSetConfigFieldsets', array(&$this->componentContext, &$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->componentData->config, &$this->extensionsParams, &$placeholders));
 				// build the config fields
 				foreach ($this->componentData->config as $field)
 				{
@@ -14078,7 +14118,7 @@ class Interpretation extends Fields
 		elseif (2 == $timer) // this is after the admin views are build
 		{
 			// Trigger Event: jcb_ce_onBeforeSetConfigFieldsets
-			$this->triggerEvent('jcb_ce_onBeforeSetConfigFieldsets', array(&$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->componentData->config, &$this->extensionsParams, &$this->placeholders));
+			$this->triggerEvent('jcb_ce_onBeforeSetConfigFieldsets', array(&$this->componentContext, &$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->componentData->config, &$this->extensionsParams, &$this->placeholders));
 			// these field sets can only be added after admin view is build
 			$this->setGroupControlConfigFieldsets($lang);
 			// these can be added anytime really (but looks best after groups
@@ -14090,7 +14130,7 @@ class Interpretation extends Fields
 			$this->setCustomControlConfigFieldsets($lang);
 		}
 		// Trigger Event: jcb_ce_onAfterSetConfigFieldsets
-		$this->triggerEvent('jcb_ce_onAfterSetConfigFieldsets', array(&$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->extensionsParams, &$this->frontEndParams, &$this->placeholders));
+		$this->triggerEvent('jcb_ce_onAfterSetConfigFieldsets', array(&$this->componentContext, &$timer, &$this->configFieldSets, &$this->configFieldSetsCustomField, &$this->extensionsParams, &$this->frontEndParams, &$this->placeholders));
 	}
 
 	public function setSiteControlConfigFieldsets($lang)
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 5457043a5..d26981031 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -69,7 +69,7 @@ class Infusion extends Interpretation
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
 			// Trigger Event: jcb_ce_onBeforeBuildFilesContent
-			$this->triggerEvent('jcb_ce_onBeforeBuildFilesContent', array(&$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
+			$this->triggerEvent('jcb_ce_onBeforeBuildFilesContent', array(&$this->componentContext, &$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
 
 			// COMPONENT
 			$this->fileContentStatic[$this->hhh . 'COMPONENT' . $this->hhh] = $this->placeholders[$this->hhh . 'COMPONENT' . $this->hhh];
@@ -276,7 +276,7 @@ class Infusion extends Interpretation
 					$this->setLockLicensePer($viewName_list, $this->target);
 
 					// Trigger Event: jcb_ce_onBeforeBuildAdminEditViewContent
-					$this->triggerEvent('jcb_ce_onBeforeBuildAdminEditViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_single], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onBeforeBuildAdminEditViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_single], &$this->placeholders, &$this->hhh));
 
 					// FIELDSETS <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single][$this->hhh . 'FIELDSETS' . $this->hhh] = $this->setFieldSet($view, $this->componentCodeName, $viewName_single, $viewName_list);
@@ -377,8 +377,11 @@ class Infusion extends Interpretation
 						}
 					}
 
+					// TABLAYOUTFIELDSARRAY <<<DYNAMIC>>> add the tab layout fields array to the model
+					$this->fileContentDynamic[$viewName_single][$this->hhh . 'TABLAYOUTFIELDSARRAY' . $this->hhh] = $this->getTabLayoutFieldsArray($viewName_single);
+
 					// Trigger Event: jcb_ce_onAfterBuildAdminEditViewContent
-					$this->triggerEvent('jcb_ce_onAfterBuildAdminEditViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_single], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onAfterBuildAdminEditViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_single], &$this->placeholders, &$this->hhh));
 				}
 				// set the views names
 				if (isset($view['settings']->name_list) && $view['settings']->name_list != 'null')
@@ -389,7 +392,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_list][$this->hhh . 'ICOMOON' . $this->hhh] = $view['icomoon'];
 
 					// Trigger Event: jcb_ce_onBeforeBuildAdminListViewContent
-					$this->triggerEvent('jcb_ce_onBeforeBuildAdminListViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_list], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onBeforeBuildAdminListViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_list], &$this->placeholders, &$this->hhh));
 
 					// set the export/import option
 					if (isset($view['port']) && $view['port'] || 1 == $view['settings']->add_custom_import)
@@ -522,7 +525,7 @@ class Infusion extends Interpretation
 					}
 
 					// Trigger Event: jcb_ce_onAfterBuildAdminListViewContent
-					$this->triggerEvent('jcb_ce_onAfterBuildAdminListViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_list], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onAfterBuildAdminListViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic[$viewName_list], &$this->placeholders, &$this->hhh));
 				}
 
 				// set u fields used in batch
@@ -605,7 +608,7 @@ class Infusion extends Interpretation
 				$this->fileContentStatic[$this->hhh . 'HELPER_EXEL' . $this->hhh] = $this->setExelHelperMethods();
 
 				// Trigger Event: jcb_ce_onAfterBuildAdminViewContent
-				$this->triggerEvent('jcb_ce_onAfterBuildAdminViewContent', array(&$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
+				$this->triggerEvent('jcb_ce_onAfterBuildAdminViewContent', array(&$this->componentContext, &$view, &$viewName_single, &$viewName_list, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
 			}
 
 			// setup custom_admin_views and all needed stuff for the site
@@ -651,7 +654,7 @@ class Infusion extends Interpretation
 					$this->placeholders[$this->bbb . 'SVIEWS' . $this->ddd] = $view['settings']->CODE;
 
 					// Trigger Event: jcb_ce_onBeforeBuildCustomAdminViewContent
-					$this->triggerEvent('jcb_ce_onBeforeBuildCustomAdminViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onBeforeBuildCustomAdminViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 
 					// set license per view if needed
 					$this->setLockLicensePer($view['settings']->code, $this->target);
@@ -705,7 +708,7 @@ class Infusion extends Interpretation
 					$this->setCustomViewTemplateBody($view);
 
 					// Trigger Event: jcb_ce_onAfterBuildCustomAdminViewContent
-					$this->triggerEvent('jcb_ce_onAfterBuildCustomAdminViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onAfterBuildCustomAdminViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 				}
 
 				// setup the layouts
@@ -872,7 +875,7 @@ class Infusion extends Interpretation
 					$this->placeholders[$this->bbb . 'SVIEWS' . $this->ddd] = $view['settings']->CODE;
 
 					// Trigger Event: jcb_ce_onBeforeBuildSiteViewContent
-					$this->triggerEvent('jcb_ce_onBeforeBuildSiteViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onBeforeBuildSiteViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 
 					// set license per view if needed
 					$this->setLockLicensePer($view['settings']->code, $this->target);
@@ -956,7 +959,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 2);
 
 					// Trigger Event: jcb_ce_onAfterBuildSiteViewContent
-					$this->triggerEvent('jcb_ce_onAfterBuildSiteViewContent', array(&$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
+					$this->triggerEvent('jcb_ce_onAfterBuildSiteViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 				}
 				// setup the layouts
 				$this->setCustomViewLayouts();
@@ -1042,7 +1045,7 @@ class Infusion extends Interpretation
 			}
 
 			// Trigger Event: jcb_ce_onAfterBuildFilesContent
-			$this->triggerEvent('jcb_ce_onAfterBuildFilesContent', array(&$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
+			$this->triggerEvent('jcb_ce_onAfterBuildFilesContent', array(&$this->componentContext, &$this->componentData, &$this->fileContentStatic, &$this->fileContentDynamic, &$this->placeholders, &$this->hhh));
 
 			return true;
 		}
@@ -1172,7 +1175,7 @@ class Infusion extends Interpretation
 		if (ComponentbuilderHelper::checkArray($this->languages))
 		{
 			// Trigger Event: jcb_ce_onBeforeBuildAllLangFiles
-			$this->triggerEvent('jcb_ce_onBeforeBuildAllLangFiles', array(&$this->languages, &$this->langTag));
+			$this->triggerEvent('jcb_ce_onBeforeBuildAllLangFiles', array(&$this->componentContext, &$this->languages, &$this->langTag));
 			// rest xml array
 			$langXML = array();
 			foreach ($this->languages as $tag => $areas)
diff --git a/admin/layouts/admin_custom_tabs/publishing.php b/admin/layouts/admin_custom_tabs/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/admin_custom_tabs/publishing.php
+++ b/admin/layouts/admin_custom_tabs/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_custom_tabs/publlshing.php b/admin/layouts/admin_custom_tabs/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/admin_custom_tabs/publlshing.php
+++ b/admin/layouts/admin_custom_tabs/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_custom_tabs/tabs_above.php b/admin/layouts/admin_custom_tabs/tabs_above.php
index a8b093d83..b2b40c7ec 100644
--- a/admin/layouts/admin_custom_tabs/tabs_above.php
+++ b/admin/layouts/admin_custom_tabs/tabs_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'admin_view'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_custom_tabs/tabs_fullwidth.php b/admin/layouts/admin_custom_tabs/tabs_fullwidth.php
index c8ac24925..a752552d2 100644
--- a/admin/layouts/admin_custom_tabs/tabs_fullwidth.php
+++ b/admin/layouts/admin_custom_tabs/tabs_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'tabs'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php
index a8b093d83..b2b40c7ec 100644
--- a/admin/layouts/admin_fields/fields_above.php
+++ b/admin/layouts/admin_fields/fields_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'admin_view'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php
index 78175ea82..a918a2705 100644
--- a/admin/layouts/admin_fields/fields_fullwidth.php
+++ b/admin/layouts/admin_fields/fields_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_views',
 	'addfields'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/admin_fields/publishing.php
+++ b/admin/layouts/admin_fields/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/admin_fields/publlshing.php
+++ b/admin/layouts/admin_fields/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php
index a8b093d83..b2b40c7ec 100644
--- a/admin/layouts/admin_fields_conditions/conditions_above.php
+++ b/admin/layouts/admin_fields_conditions/conditions_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'admin_view'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php
index 055fa58d4..1b15b3b5a 100644
--- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php
+++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_conditions',
 	'addconditions'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/admin_fields_conditions/publishing.php
+++ b/admin/layouts/admin_fields_conditions/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/admin_fields_conditions/publlshing.php
+++ b/admin/layouts/admin_fields_conditions/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_relations/publishing.php b/admin/layouts/admin_fields_relations/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/admin_fields_relations/publishing.php
+++ b/admin/layouts/admin_fields_relations/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_relations/publlshing.php b/admin/layouts/admin_fields_relations/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/admin_fields_relations/publlshing.php
+++ b/admin/layouts/admin_fields_relations/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_relations/relations_above.php b/admin/layouts/admin_fields_relations/relations_above.php
index a8b093d83..b2b40c7ec 100644
--- a/admin/layouts/admin_fields_relations/relations_above.php
+++ b/admin/layouts/admin_fields_relations/relations_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'admin_view'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_fields_relations/relations_fullwidth.php b/admin/layouts/admin_fields_relations/relations_fullwidth.php
index 8f36f70aa..e9924f9f5 100644
--- a/admin/layouts/admin_fields_relations/relations_fullwidth.php
+++ b/admin/layouts/admin_fields_relations/relations_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_relations',
 	'addrelations'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php
index 54bc14a23..f0d6b08f1 100644
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_css_view',
 	'css_view',
 	'add_css_views',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php
index 991fecdaa..4ad01649d 100644
--- a/admin/layouts/admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'php_controller',
 	'php_model',
 	'php_controller_list',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php
index ca9bfab48..473668b80 100644
--- a/admin/layouts/admin_view/custom_buttons_left.php
+++ b/admin/layouts/admin_view/custom_buttons_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_custom_button',
 	'custom_button'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php
index 1145a7385..e85f78a27 100644
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_beginner_import',
 	'note_advanced_import',
 	'add_custom_import',
@@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php
index d8761d659..0b9969524 100644
--- a/admin/layouts/admin_view/details_above.php
+++ b/admin/layouts/admin_view/details_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'system_name'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/details_fullwidth.php b/admin/layouts/admin_view/details_fullwidth.php
index f72766e64..039e99c5d 100644
--- a/admin/layouts/admin_view/details_fullwidth.php
+++ b/admin/layouts/admin_view/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_linked_to_notice'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php
index c9a5837cf..52336d424 100644
--- a/admin/layouts/admin_view/details_left.php
+++ b/admin/layouts/admin_view/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name_single',
 	'name_list',
 	'type',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php
index ea24651db..61beabab2 100644
--- a/admin/layouts/admin_view/details_right.php
+++ b/admin/layouts/admin_view/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'short_description',
 	'description',
 	'add_fadein'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/admin_view/details_under.php
+++ b/admin/layouts/admin_view/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php
index 2321c09b2..b51b04d26 100644
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_create_edit_display'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/fields_left.php b/admin/layouts/admin_view/fields_left.php
index 01d0e36bf..45f312f65 100644
--- a/admin/layouts/admin_view/fields_left.php
+++ b/admin/layouts/admin_view/fields_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_create_edit_notice',
 	'alias_builder_type',
 	'note_alias_builder_custom',
@@ -25,9 +36,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/fields_right.php b/admin/layouts/admin_view/fields_right.php
index 318e7a147..f21758690 100644
--- a/admin/layouts/admin_view/fields_right.php
+++ b/admin/layouts/admin_view/fields_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_create_edit_buttons'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php
index 4c55e4a6f..95b40a13a 100644
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_javascript_view_file',
 	'javascript_view_file',
 	'add_javascript_view_footer',
@@ -28,6 +39,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -36,3 +48,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php
index 640f82da2..b8ff4a775 100644
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'sql'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php
index 26f3e5c48..c4958cca5 100644
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'mysql_table_engine',
 	'mysql_table_charset',
 	'mysql_table_collate',
@@ -27,9 +38,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index 9d4ee2be4..288767a5c 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_ajax',
 	'php_ajaxmethod',
 	'ajax_input',
@@ -61,6 +72,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -69,3 +81,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php
index 53193b6e8..1992187e4 100644
--- a/admin/layouts/admin_view/settings_fullwidth.php
+++ b/admin/layouts/admin_view/settings_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_permissions',
 	'addpermissions',
 	'note_on_tabs',
@@ -27,6 +38,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -35,3 +47,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_admin_views/publishing.php b/admin/layouts/component_admin_views/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_admin_views/publishing.php
+++ b/admin/layouts/component_admin_views/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_admin_views/publlshing.php b/admin/layouts/component_admin_views/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_admin_views/publlshing.php
+++ b/admin/layouts/component_admin_views/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_admin_views/views_above.php b/admin/layouts/component_admin_views/views_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_admin_views/views_above.php
+++ b/admin/layouts/component_admin_views/views_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_admin_views/views_fullwidth.php b/admin/layouts/component_admin_views/views_fullwidth.php
index 5d443a5b3..cedd88ba6 100644
--- a/admin/layouts/component_admin_views/views_fullwidth.php
+++ b/admin/layouts/component_admin_views/views_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_admin_views',
 	'addadmin_views'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_config/publishing.php b/admin/layouts/component_config/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_config/publishing.php
+++ b/admin/layouts/component_config/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_config/publlshing.php b/admin/layouts/component_config/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_config/publlshing.php
+++ b/admin/layouts/component_config/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_config/tweaks_above.php b/admin/layouts/component_config/tweaks_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_config/tweaks_above.php
+++ b/admin/layouts/component_config/tweaks_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_config/tweaks_fullwidth.php b/admin/layouts/component_config/tweaks_fullwidth.php
index 3fcdda1e5..b74219ebe 100644
--- a/admin/layouts/component_config/tweaks_fullwidth.php
+++ b/admin/layouts/component_config/tweaks_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'addconfig'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_menus/publishing.php b/admin/layouts/component_custom_admin_menus/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_custom_admin_menus/publishing.php
+++ b/admin/layouts/component_custom_admin_menus/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_menus/publlshing.php b/admin/layouts/component_custom_admin_menus/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_custom_admin_menus/publlshing.php
+++ b/admin/layouts/component_custom_admin_menus/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_menus/tweaks_above.php b/admin/layouts/component_custom_admin_menus/tweaks_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_custom_admin_menus/tweaks_above.php
+++ b/admin/layouts/component_custom_admin_menus/tweaks_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php b/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php
index e41be7f7c..ca966437b 100644
--- a/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php
+++ b/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'addcustommenus'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_views/publishing.php b/admin/layouts/component_custom_admin_views/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_custom_admin_views/publishing.php
+++ b/admin/layouts/component_custom_admin_views/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_views/publlshing.php b/admin/layouts/component_custom_admin_views/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_custom_admin_views/publlshing.php
+++ b/admin/layouts/component_custom_admin_views/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_views/views_above.php b/admin/layouts/component_custom_admin_views/views_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_custom_admin_views/views_above.php
+++ b/admin/layouts/component_custom_admin_views/views_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_custom_admin_views/views_fullwidth.php b/admin/layouts/component_custom_admin_views/views_fullwidth.php
index 7ddadfb4a..e0542065f 100644
--- a/admin/layouts/component_custom_admin_views/views_fullwidth.php
+++ b/admin/layouts/component_custom_admin_views/views_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_custom_admin_views',
 	'addcustom_admin_views'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_dashboard/dashboard_above.php b/admin/layouts/component_dashboard/dashboard_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_dashboard/dashboard_above.php
+++ b/admin/layouts/component_dashboard/dashboard_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_dashboard/dashboard_fullwidth.php b/admin/layouts/component_dashboard/dashboard_fullwidth.php
index 01362056f..075cab4d6 100644
--- a/admin/layouts/component_dashboard/dashboard_fullwidth.php
+++ b/admin/layouts/component_dashboard/dashboard_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'php_dashboard_methods',
 	'dashboard_tab'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_dashboard/publishing.php b/admin/layouts/component_dashboard/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_dashboard/publishing.php
+++ b/admin/layouts/component_dashboard/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_dashboard/publlshing.php b/admin/layouts/component_dashboard/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_dashboard/publlshing.php
+++ b/admin/layouts/component_dashboard/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_files_folders/advance_fullwidth.php b/admin/layouts/component_files_folders/advance_fullwidth.php
index a6c96f370..b5112d859 100644
--- a/admin/layouts/component_files_folders/advance_fullwidth.php
+++ b/admin/layouts/component_files_folders/advance_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_add_files_fullpath',
 	'addfilesfullpath',
 	'note_add_folders_fullpath',
@@ -25,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -33,3 +45,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_files_folders/basic_above.php b/admin/layouts/component_files_folders/basic_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_files_folders/basic_above.php
+++ b/admin/layouts/component_files_folders/basic_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_files_folders/basic_fullwidth.php b/admin/layouts/component_files_folders/basic_fullwidth.php
index eb0acf684..c027419f9 100644
--- a/admin/layouts/component_files_folders/basic_fullwidth.php
+++ b/admin/layouts/component_files_folders/basic_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_add_files',
 	'addfiles',
 	'note_add_folders',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_files_folders/publishing.php b/admin/layouts/component_files_folders/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_files_folders/publishing.php
+++ b/admin/layouts/component_files_folders/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_files_folders/publlshing.php b/admin/layouts/component_files_folders/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_files_folders/publlshing.php
+++ b/admin/layouts/component_files_folders/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_mysql_tweaks/publishing.php b/admin/layouts/component_mysql_tweaks/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_mysql_tweaks/publishing.php
+++ b/admin/layouts/component_mysql_tweaks/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_mysql_tweaks/publlshing.php b/admin/layouts/component_mysql_tweaks/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_mysql_tweaks/publlshing.php
+++ b/admin/layouts/component_mysql_tweaks/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_mysql_tweaks/tweaks_above.php b/admin/layouts/component_mysql_tweaks/tweaks_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_mysql_tweaks/tweaks_above.php
+++ b/admin/layouts/component_mysql_tweaks/tweaks_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php b/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php
index 8660eb189..696368c1c 100644
--- a/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php
+++ b/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'sql_tweak'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_placeholders/details_above.php b/admin/layouts/component_placeholders/details_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_placeholders/details_above.php
+++ b/admin/layouts/component_placeholders/details_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_placeholders/details_fullwidth.php b/admin/layouts/component_placeholders/details_fullwidth.php
index f23de1666..57405bc2f 100644
--- a/admin/layouts/component_placeholders/details_fullwidth.php
+++ b/admin/layouts/component_placeholders/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'addplaceholders'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_placeholders/publishing.php b/admin/layouts/component_placeholders/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_placeholders/publishing.php
+++ b/admin/layouts/component_placeholders/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_placeholders/publlshing.php b/admin/layouts/component_placeholders/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_placeholders/publlshing.php
+++ b/admin/layouts/component_placeholders/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_site_views/publishing.php b/admin/layouts/component_site_views/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_site_views/publishing.php
+++ b/admin/layouts/component_site_views/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_site_views/publlshing.php b/admin/layouts/component_site_views/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_site_views/publlshing.php
+++ b/admin/layouts/component_site_views/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_site_views/views_above.php b/admin/layouts/component_site_views/views_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_site_views/views_above.php
+++ b/admin/layouts/component_site_views/views_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_site_views/views_fullwidth.php b/admin/layouts/component_site_views/views_fullwidth.php
index 465f08534..e01f97e8e 100644
--- a/admin/layouts/component_site_views/views_fullwidth.php
+++ b/admin/layouts/component_site_views/views_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_site_views',
 	'addsite_views'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_updates/publishing.php b/admin/layouts/component_updates/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/component_updates/publishing.php
+++ b/admin/layouts/component_updates/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_updates/publlshing.php b/admin/layouts/component_updates/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/component_updates/publlshing.php
+++ b/admin/layouts/component_updates/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/component_updates/updates_above.php b/admin/layouts/component_updates/updates_above.php
index 386139b66..0da7e528d 100644
--- a/admin/layouts/component_updates/updates_above.php
+++ b/admin/layouts/component_updates/updates_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'joomla_component'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/component_updates/updates_fullwidth.php b/admin/layouts/component_updates/updates_fullwidth.php
index 9e225baad..37710d615 100644
--- a/admin/layouts/component_updates/updates_fullwidth.php
+++ b/admin/layouts/component_updates/updates_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'version_update'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
index 5b66cc781..da2e095b1 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'php_controller',
 	'php_model'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php
index ca9bfab48..473668b80 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_custom_button',
 	'custom_button'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php
index 564ef15e9..e36b108b9 100644
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'system_name',
 	'context'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php
index 7e5054615..6d03f6c71 100644
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'default'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php
index 686776af3..3c95591f7 100644
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'codename',
 	'description',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php
index 85377a1f1..1feadf4ee 100644
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'icon',
 	'snippet',
 	'note_uikit_snippet',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php
index dddfb3d0f..76933ba52 100644
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'custom_get',
 	'main_get',
 	'dynamic_get',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/javascript_css_fullwidth.php b/admin/layouts/custom_admin_view/javascript_css_fullwidth.php
index 8b87f9de2..85d3704e6 100644
--- a/admin/layouts/custom_admin_view/javascript_css_fullwidth.php
+++ b/admin/layouts/custom_admin_view/javascript_css_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_js_document',
 	'js_document',
 	'add_javascript_file',
@@ -28,6 +39,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -36,3 +48,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
index f72766e64..039e99c5d 100644
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_linked_to_notice'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/php_fullwidth.php b/admin/layouts/custom_admin_view/php_fullwidth.php
index cf7142f5a..38eca1009 100644
--- a/admin/layouts/custom_admin_view/php_fullwidth.php
+++ b/admin/layouts/custom_admin_view/php_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_ajax',
 	'php_ajaxmethod',
 	'ajax_input',
@@ -31,6 +42,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -39,3 +51,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php
index d54ecc0ad..811bcf109 100644
--- a/admin/layouts/custom_code/details_above.php
+++ b/admin/layouts/custom_code/details_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'target',
 	'system_name',
 	'function_name'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php
index 313061d34..1d7ea82e0 100644
--- a/admin/layouts/custom_code/details_fullwidth.php
+++ b/admin/layouts/custom_code/details_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'path',
 	'note_jcb_placeholder',
 	'code',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php
index 32218d885..002297f05 100644
--- a/admin/layouts/custom_code/details_left.php
+++ b/admin/layouts/custom_code/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'comment_type',
 	'component',
 	'type',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php
index be1e3d3b0..3f92a2ff9 100644
--- a/admin/layouts/custom_code/details_right.php
+++ b/admin/layouts/custom_code/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'from_line',
 	'to_line',
 	'hashendtarget'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/custom_code/details_under.php
+++ b/admin/layouts/custom_code/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/custom_code/publishing.php
+++ b/admin/layouts/custom_code/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/custom_code/publlshing.php
+++ b/admin/layouts/custom_code/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php
index b96bde05d..8a61afadd 100644
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_calculation_item',
 	'note_calculation_items',
 	'php_calculation'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php
index eba7a926d..1db9b61d0 100644
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'addcalculation'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php
index eb83596bf..25ed34938 100644
--- a/admin/layouts/dynamic_get/custom_script_fullwidth.php
+++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_before_getitem',
 	'php_before_getitem',
 	'add_php_after_getitem',
@@ -32,6 +43,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -40,3 +52,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php
index bd61af3b7..dec197175 100644
--- a/admin/layouts/dynamic_get/joint_fullwidth.php
+++ b/admin/layouts/dynamic_get/joint_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'join_view_table',
 	'join_db_table'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php
index d87e3fa26..e2304a9bd 100644
--- a/admin/layouts/dynamic_get/main_above.php
+++ b/admin/layouts/dynamic_get/main_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'gettype',
 	'getcustom',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php
index 417a38333..64a9af834 100644
--- a/admin/layouts/dynamic_get/main_fullwidth.php
+++ b/admin/layouts/dynamic_get/main_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'php_custom_get',
 	'note_linked_to_notice'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php
index d5fde1138..06118e5c1 100644
--- a/admin/layouts/dynamic_get/main_left.php
+++ b/admin/layouts/dynamic_get/main_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'main_source',
 	'view_table_main',
 	'db_table_main',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php
index 5ea710619..e50880b0e 100644
--- a/admin/layouts/dynamic_get/main_right.php
+++ b/admin/layouts/dynamic_get/main_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'plugin_events'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/dynamic_get/main_under.php
+++ b/admin/layouts/dynamic_get/main_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/dynamic_get/tweak_fullwidth.php b/admin/layouts/dynamic_get/tweak_fullwidth.php
index 0a85c6f11..106ac847a 100644
--- a/admin/layouts/dynamic_get/tweak_fullwidth.php
+++ b/admin/layouts/dynamic_get/tweak_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'filter',
 	'where',
 	'order',
@@ -25,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -33,3 +45,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/field/database_fullwidth.php b/admin/layouts/field/database_fullwidth.php
index 124269579..ad559fa96 100644
--- a/admin/layouts/field/database_fullwidth.php
+++ b/admin/layouts/field/database_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_no_database_settings_needed',
 	'note_database_settings_needed'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/field/database_left.php b/admin/layouts/field/database_left.php
index 3832e4b83..4d70bc133 100644
--- a/admin/layouts/field/database_left.php
+++ b/admin/layouts/field/database_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'datatype',
 	'datalenght',
 	'datalenght_other',
@@ -25,9 +36,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/field/database_right.php b/admin/layouts/field/database_right.php
index 738776e97..b311d32ec 100644
--- a/admin/layouts/field/database_right.php
+++ b/admin/layouts/field/database_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'indexes',
 	'null_switch',
 	'store',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/field/publishing.php
+++ b/admin/layouts/field/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/field/publlshing.php
+++ b/admin/layouts/field/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php
index 7ba4d502c..3963c887f 100644
--- a/admin/layouts/field/scripts_left.php
+++ b/admin/layouts/field/scripts_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_css_view',
 	'css_view',
 	'add_css_views',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php
index b38bc241a..2e852c926 100644
--- a/admin/layouts/field/scripts_right.php
+++ b/admin/layouts/field/scripts_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_javascript_view_footer',
 	'javascript_view_footer',
 	'add_javascript_views_footer',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/field/set_properties_above.php b/admin/layouts/field/set_properties_above.php
index 538a7f8f0..fe606e164 100644
--- a/admin/layouts/field/set_properties_above.php
+++ b/admin/layouts/field/set_properties_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'fieldtype',
 	'name',
 	'catid'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/field/set_properties_fullwidth.php b/admin/layouts/field/set_properties_fullwidth.php
index 0ee91fbe6..de505c49a 100644
--- a/admin/layouts/field/set_properties_fullwidth.php
+++ b/admin/layouts/field/set_properties_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_select_field_type',
 	'note_filter_information'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/field/set_properties_under.php b/admin/layouts/field/set_properties_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/field/set_properties_under.php
+++ b/admin/layouts/field/set_properties_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/field/type_info_fullwidth.php b/admin/layouts/field/type_info_fullwidth.php
index 5ac146da2..7cc6478c3 100644
--- a/admin/layouts/field/type_info_fullwidth.php
+++ b/admin/layouts/field/type_info_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'helpnote',
 	'xml'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/database_defaults_left.php b/admin/layouts/fieldtype/database_defaults_left.php
index c47a0b0db..56d886fb4 100644
--- a/admin/layouts/fieldtype/database_defaults_left.php
+++ b/admin/layouts/fieldtype/database_defaults_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'has_defaults',
 	'datatype',
 	'datalenght',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/database_defaults_right.php b/admin/layouts/fieldtype/database_defaults_right.php
index 738776e97..b311d32ec 100644
--- a/admin/layouts/fieldtype/database_defaults_right.php
+++ b/admin/layouts/fieldtype/database_defaults_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'indexes',
 	'null_switch',
 	'store',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/details_above.php b/admin/layouts/fieldtype/details_above.php
index 1fb957c8f..3527a8cb4 100644
--- a/admin/layouts/fieldtype/details_above.php
+++ b/admin/layouts/fieldtype/details_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php
index 1666a0816..c563d214f 100644
--- a/admin/layouts/fieldtype/details_fullwidth.php
+++ b/admin/layouts/fieldtype/details_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_fields',
 	'properties',
 	'not_required'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php
index ce4ad69ad..79c66a29d 100644
--- a/admin/layouts/fieldtype/details_left.php
+++ b/admin/layouts/fieldtype/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'catid',
 	'short_description'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php
index 679874d4e..3ce9fbbfa 100644
--- a/admin/layouts/fieldtype/details_right.php
+++ b/admin/layouts/fieldtype/details_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/fieldtype/publishing.php
+++ b/admin/layouts/fieldtype/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/fieldtype/publlshing.php
+++ b/admin/layouts/fieldtype/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 481838ff8..2c4504f83 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'title',
 	'alias'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index fc702b376..6e4ede945 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'content'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index 2110045f5..c9581d983 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'target',
 	'groups',
 	'location',
@@ -25,9 +36,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 29221087f..7171927ee 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'type',
 	'url',
 	'article'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index 7d86382ff..c40fd6c94 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'version',
@@ -25,9 +36,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php
index ea4e55d8c..ddffd390b 100644
--- a/admin/layouts/joomla_component/admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/admin_views_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_admin_views',
 	'note_display_component_admin_views'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
index 4d22dc6c4..356d1c2ee 100644
--- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_custom_admin_views',
 	'note_display_component_custom_admin_views'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/dash_install_fullwidth.php b/admin/layouts/joomla_component/dash_install_fullwidth.php
index 5a6e42f01..99069e861 100644
--- a/admin/layouts/joomla_component/dash_install_fullwidth.php
+++ b/admin/layouts/joomla_component/dash_install_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_preflight_install',
 	'php_preflight_install',
 	'add_php_preflight_update',
@@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/dash_install_left.php b/admin/layouts/joomla_component/dash_install_left.php
index 3547d54d1..9ad875a90 100644
--- a/admin/layouts/joomla_component/dash_install_left.php
+++ b/admin/layouts/joomla_component/dash_install_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'dashboard_type'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/dash_install_right.php b/admin/layouts/joomla_component/dash_install_right.php
index d5a36d891..b5edf8afd 100644
--- a/admin/layouts/joomla_component/dash_install_right.php
+++ b/admin/layouts/joomla_component/dash_install_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_dynamic_dashboard',
 	'dashboard',
 	'note_botton_component_dashboard'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php
index d8761d659..0b9969524 100644
--- a/admin/layouts/joomla_component/details_above.php
+++ b/admin/layouts/joomla_component/details_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'system_name'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php
index 89fc23a04..9f01c24f0 100644
--- a/admin/layouts/joomla_component/details_left.php
+++ b/admin/layouts/joomla_component/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'name_code',
 	'component_version',
@@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php
index 1be7b87c8..7bd15612c 100644
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'companyname',
 	'author',
 	'email',
@@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/joomla_component/details_under.php
+++ b/admin/layouts/joomla_component/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
index 120955d39..fa524f2a6 100644
--- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_buildcomp_dynamic_mysql',
 	'buildcomp',
 	'buildcompsql'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/dynamic_integration_left.php b/admin/layouts/joomla_component/dynamic_integration_left.php
index 36818ddf9..45d0c1960 100644
--- a/admin/layouts/joomla_component/dynamic_integration_left.php
+++ b/admin/layouts/joomla_component/dynamic_integration_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_update_server',
 	'update_server_url',
 	'update_server_target',
@@ -29,9 +40,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/dynamic_integration_right.php b/admin/layouts/joomla_component/dynamic_integration_right.php
index f5315bdb4..72351b669 100644
--- a/admin/layouts/joomla_component/dynamic_integration_right.php
+++ b/admin/layouts/joomla_component/dynamic_integration_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'translation_tool',
 	'note_crowdin',
 	'crowdin_project_identifier',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
index 75471afa1..8ac6a3745 100644
--- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php
+++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'creatuserhelper',
 	'adduikit',
 	'addfootable',
@@ -40,6 +51,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -48,3 +60,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php
index 297d6dd2e..95a45a88b 100644
--- a/admin/layouts/joomla_component/mysql_fullwidth.php
+++ b/admin/layouts/joomla_component/mysql_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_sql',
 	'sql',
 	'add_sql_uninstall',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php
index af672bb37..7f3f312c2 100644
--- a/admin/layouts/joomla_component/publishing.php
+++ b/admin/layouts/joomla_component/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php
index d904442c0..bc6fda557 100644
--- a/admin/layouts/joomla_component/readme_left.php
+++ b/admin/layouts/joomla_component/readme_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'addreadme',
 	'readme'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php
index c521ff3bd..9c4959e63 100644
--- a/admin/layouts/joomla_component/readme_right.php
+++ b/admin/layouts/joomla_component/readme_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_readme'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/settings_fullwidth.php b/admin/layouts/joomla_component/settings_fullwidth.php
index 4d7f7412f..83d1c02a6 100644
--- a/admin/layouts/joomla_component/settings_fullwidth.php
+++ b/admin/layouts/joomla_component/settings_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'spacer_hr_seven',
 	'note_on_contributors',
 	'addcontributors',
@@ -25,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -33,3 +45,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php
index bd91f16e8..1926c7a9b 100644
--- a/admin/layouts/joomla_component/settings_left.php
+++ b/admin/layouts/joomla_component/settings_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_moved_views',
 	'spacer_hr_one',
 	'note_mysql_tweak_options',
@@ -27,9 +38,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php
index 9e99a711a..929cd3b08 100644
--- a/admin/layouts/joomla_component/settings_right.php
+++ b/admin/layouts/joomla_component/settings_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_component_files_folders',
 	'spacer_hr_four',
 	'add_menu_prefix',
@@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php
index 456bcff1e..f8485fd37 100644
--- a/admin/layouts/joomla_component/site_views_fullwidth.php
+++ b/admin/layouts/joomla_component/site_views_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_on_site_views',
 	'note_display_component_site_views'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php
index 5c6226fd3..18159298f 100644
--- a/admin/layouts/language/details_left.php
+++ b/admin/layouts/language/details_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php
index b0c3c99ce..d5c6ea351 100644
--- a/admin/layouts/language/details_right.php
+++ b/admin/layouts/language/details_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'langtag'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/language/publishing.php
+++ b/admin/layouts/language/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/language/publlshing.php
+++ b/admin/layouts/language/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php
index aa696de85..bb4e00bdf 100644
--- a/admin/layouts/language_translation/details_fullwidth.php
+++ b/admin/layouts/language_translation/details_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'source',
 	'translation',
 	'components'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/language_translation/publishing.php
+++ b/admin/layouts/language_translation/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/language_translation/publlshing.php
+++ b/admin/layouts/language_translation/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php
index 086c0795d..99ccd4de2 100644
--- a/admin/layouts/layout/custom_script_fullwidth.php
+++ b/admin/layouts/layout/custom_script_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_view',
 	'php_view'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php
index 761b526e3..c3f2241c1 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'layout'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php
index 94595a664..b1e8dac3d 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'alias',
 	'description',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php
index 9a1b6f719..1f3346970 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'snippet',
 	'note_uikit_snippet',
 	'note_snippet_usage'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php
index c959fb10a..67bfa97e3 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'dynamic_get',
 	'dynamic_values'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library/behaviour_above.php b/admin/layouts/library/behaviour_above.php
index cf89269be..62a28fbaf 100644
--- a/admin/layouts/library/behaviour_above.php
+++ b/admin/layouts/library/behaviour_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'how',
 	'type'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library/behaviour_fullwidth.php b/admin/layouts/library/behaviour_fullwidth.php
index c5b68899e..fb59668b7 100644
--- a/admin/layouts/library/behaviour_fullwidth.php
+++ b/admin/layouts/library/behaviour_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_no_behaviour_one',
 	'note_yes_behaviour_one',
 	'note_build_in_behaviour_one',
@@ -25,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -33,3 +45,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library/behaviour_left.php b/admin/layouts/library/behaviour_left.php
index bb381c8d9..f3d40f38c 100644
--- a/admin/layouts/library/behaviour_left.php
+++ b/admin/layouts/library/behaviour_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_library_instruction',
 	'libraries'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library/behaviour_right.php b/admin/layouts/library/behaviour_right.php
index 679874d4e..3ce9fbbfa 100644
--- a/admin/layouts/library/behaviour_right.php
+++ b/admin/layouts/library/behaviour_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library/behaviour_under.php b/admin/layouts/library/behaviour_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/library/behaviour_under.php
+++ b/admin/layouts/library/behaviour_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library/config_fullwidth.php b/admin/layouts/library/config_fullwidth.php
index 64088b18b..3f32c559e 100644
--- a/admin/layouts/library/config_fullwidth.php
+++ b/admin/layouts/library/config_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_no_behaviour_two',
 	'note_yes_behaviour_two',
 	'note_build_in_behaviour_two',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library/files_folders_urls_fullwidth.php b/admin/layouts/library/files_folders_urls_fullwidth.php
index 43c397a35..19ff750bf 100644
--- a/admin/layouts/library/files_folders_urls_fullwidth.php
+++ b/admin/layouts/library/files_folders_urls_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_no_behaviour_three',
 	'note_build_in_behaviour_three',
 	'note_display_library_files_folders_urls'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library/linked_fullwidth.php b/admin/layouts/library/linked_fullwidth.php
index f72766e64..039e99c5d 100644
--- a/admin/layouts/library/linked_fullwidth.php
+++ b/admin/layouts/library/linked_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_linked_to_notice'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library/publishing.php b/admin/layouts/library/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/library/publishing.php
+++ b/admin/layouts/library/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library/publlshing.php b/admin/layouts/library/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/library/publlshing.php
+++ b/admin/layouts/library/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library_config/publishing.php b/admin/layouts/library_config/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/library_config/publishing.php
+++ b/admin/layouts/library_config/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library_config/publlshing.php b/admin/layouts/library_config/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/library_config/publlshing.php
+++ b/admin/layouts/library_config/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library_config/tweaks_above.php b/admin/layouts/library_config/tweaks_above.php
index 9c6adbb27..8503987e0 100644
--- a/admin/layouts/library_config/tweaks_above.php
+++ b/admin/layouts/library_config/tweaks_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'library'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library_config/tweaks_fullwidth.php b/admin/layouts/library_config/tweaks_fullwidth.php
index 3fcdda1e5..b74219ebe 100644
--- a/admin/layouts/library_config/tweaks_fullwidth.php
+++ b/admin/layouts/library_config/tweaks_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'addconfig'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library_files_folders_urls/advance_fullwidth.php b/admin/layouts/library_files_folders_urls/advance_fullwidth.php
index a6c96f370..b5112d859 100644
--- a/admin/layouts/library_files_folders_urls/advance_fullwidth.php
+++ b/admin/layouts/library_files_folders_urls/advance_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_add_files_fullpath',
 	'addfilesfullpath',
 	'note_add_folders_fullpath',
@@ -25,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -33,3 +45,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library_files_folders_urls/basic_above.php b/admin/layouts/library_files_folders_urls/basic_above.php
index 9c6adbb27..8503987e0 100644
--- a/admin/layouts/library_files_folders_urls/basic_above.php
+++ b/admin/layouts/library_files_folders_urls/basic_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'library'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library_files_folders_urls/basic_fullwidth.php b/admin/layouts/library_files_folders_urls/basic_fullwidth.php
index 7dcdef114..60e54aae2 100644
--- a/admin/layouts/library_files_folders_urls/basic_fullwidth.php
+++ b/admin/layouts/library_files_folders_urls/basic_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_add_urls',
 	'addurls',
 	'note_add_files',
@@ -26,6 +37,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -34,3 +46,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/library_files_folders_urls/publishing.php b/admin/layouts/library_files_folders_urls/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/library_files_folders_urls/publishing.php
+++ b/admin/layouts/library_files_folders_urls/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/library_files_folders_urls/publlshing.php b/admin/layouts/library_files_folders_urls/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/library_files_folders_urls/publlshing.php
+++ b/admin/layouts/library_files_folders_urls/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/placeholder/details_fullwidth.php b/admin/layouts/placeholder/details_fullwidth.php
index 81b416823..66e50cfcf 100644
--- a/admin/layouts/placeholder/details_fullwidth.php
+++ b/admin/layouts/placeholder/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_placeholders_placedin'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/placeholder/details_left.php b/admin/layouts/placeholder/details_left.php
index e768c77e1..97c37799b 100644
--- a/admin/layouts/placeholder/details_left.php
+++ b/admin/layouts/placeholder/details_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'target'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/placeholder/details_right.php b/admin/layouts/placeholder/details_right.php
index 6cd004a6e..a4b3f71b9 100644
--- a/admin/layouts/placeholder/details_right.php
+++ b/admin/layouts/placeholder/details_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'value'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/placeholder/publishing.php b/admin/layouts/placeholder/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/placeholder/publishing.php
+++ b/admin/layouts/placeholder/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/placeholder/publlshing.php b/admin/layouts/placeholder/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/placeholder/publlshing.php
+++ b/admin/layouts/placeholder/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/server/details_above.php b/admin/layouts/server/details_above.php
index d34733ceb..0e0361fcc 100644
--- a/admin/layouts/server/details_above.php
+++ b/admin/layouts/server/details_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'protocol'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/server/details_fullwidth.php b/admin/layouts/server/details_fullwidth.php
index c8b458ebf..064de9bd9 100644
--- a/admin/layouts/server/details_fullwidth.php
+++ b/admin/layouts/server/details_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_ftp_signature',
 	'signature',
 	'note_ssh_security',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/server/details_left.php b/admin/layouts/server/details_left.php
index da3f41193..e3257bc34 100644
--- a/admin/layouts/server/details_left.php
+++ b/admin/layouts/server/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'username',
 	'host',
 	'port',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/server/details_right.php b/admin/layouts/server/details_right.php
index 484c26bcd..154e5469b 100644
--- a/admin/layouts/server/details_right.php
+++ b/admin/layouts/server/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'authentication',
 	'password',
 	'private',
@@ -25,9 +36,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/server/publishing.php b/admin/layouts/server/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/server/publishing.php
+++ b/admin/layouts/server/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/server/publlshing.php b/admin/layouts/server/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/server/publlshing.php
+++ b/admin/layouts/server/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php
index 5d9f0db34..665c1c65d 100644
--- a/admin/layouts/site_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/site_view/custom_buttons_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_custom_toolbar_placeholder',
 	'custom_button',
 	'php_controller',
@@ -24,6 +35,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -32,3 +44,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php
index 4838206d2..6c13821c3 100644
--- a/admin/layouts/site_view/custom_buttons_left.php
+++ b/admin/layouts/site_view/custom_buttons_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_custom_button'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php
index 2428befae..9a91c2772 100644
--- a/admin/layouts/site_view/custom_buttons_right.php
+++ b/admin/layouts/site_view/custom_buttons_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'button_position'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php
index 564ef15e9..e36b108b9 100644
--- a/admin/layouts/site_view/details_above.php
+++ b/admin/layouts/site_view/details_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'system_name',
 	'context'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php
index 7e5054615..6d03f6c71 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'default'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php
index 686776af3..3c95591f7 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'codename',
 	'description',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php
index 9a1b6f719..1f3346970 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'snippet',
 	'note_uikit_snippet',
 	'note_snippet_usage'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php
index dddfb3d0f..76933ba52 100644
--- a/admin/layouts/site_view/details_rightside.php
+++ b/admin/layouts/site_view/details_rightside.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'custom_get',
 	'main_get',
 	'dynamic_get',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/site_view/details_under.php
+++ b/admin/layouts/site_view/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php
index 182cd1d05..dcf04dde8 100644
--- a/admin/layouts/site_view/javascript_css_fullwidth.php
+++ b/admin/layouts/site_view/javascript_css_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_javascript_file',
 	'javascript_file',
 	'add_js_document',
@@ -28,6 +39,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -36,3 +48,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php
index f72766e64..039e99c5d 100644
--- a/admin/layouts/site_view/linked_components_fullwidth.php
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_linked_to_notice'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php
index cf7142f5a..38eca1009 100644
--- a/admin/layouts/site_view/php_fullwidth.php
+++ b/admin/layouts/site_view/php_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_ajax',
 	'php_ajaxmethod',
 	'ajax_input',
@@ -31,6 +42,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -39,3 +51,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/contributor_fullwidth.php b/admin/layouts/snippet/contributor_fullwidth.php
index 7c3b14d09..e98254a15 100644
--- a/admin/layouts/snippet/contributor_fullwidth.php
+++ b/admin/layouts/snippet/contributor_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'note_contributor_details'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/contributor_left.php b/admin/layouts/snippet/contributor_left.php
index 1c3e5f647..469c5e7a1 100644
--- a/admin/layouts/snippet/contributor_left.php
+++ b/admin/layouts/snippet/contributor_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'contributor_company',
 	'contributor_website'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/contributor_right.php b/admin/layouts/snippet/contributor_right.php
index b0885808e..ac2e16f7a 100644
--- a/admin/layouts/snippet/contributor_right.php
+++ b/admin/layouts/snippet/contributor_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'contributor_name',
 	'contributor_email'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php
index 561d8f227..68f0ca1c9 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'url',
 	'library'
@@ -23,6 +34,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -31,3 +43,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php
index 804b79f76..ca18f40a0 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'type',
 	'heading',
 	'description',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php
index 622c652db..40e620d0a 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'snippet'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet_type/details_left.php b/admin/layouts/snippet_type/details_left.php
index 5c6226fd3..18159298f 100644
--- a/admin/layouts/snippet_type/details_left.php
+++ b/admin/layouts/snippet_type/details_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet_type/details_right.php b/admin/layouts/snippet_type/details_right.php
index 679874d4e..3ce9fbbfa 100644
--- a/admin/layouts/snippet_type/details_right.php
+++ b/admin/layouts/snippet_type/details_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'description'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet_type/publishing.php b/admin/layouts/snippet_type/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/snippet_type/publishing.php
+++ b/admin/layouts/snippet_type/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/snippet_type/publlshing.php b/admin/layouts/snippet_type/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/snippet_type/publlshing.php
+++ b/admin/layouts/snippet_type/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php
index 086c0795d..99ccd4de2 100644
--- a/admin/layouts/template/custom_script_fullwidth.php
+++ b/admin/layouts/template/custom_script_fullwidth.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'add_php_view',
 	'php_view'
 );
@@ -22,6 +33,7 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -30,3 +42,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php
index 32c676529..4a7880a1e 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'template'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php
index 94595a664..b1e8dac3d 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name',
 	'alias',
 	'description',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php
index 771a1ebef..5a572e3e4 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'snippet',
 	'note_snippet_usage',
 	'note_uikit_snippet'
@@ -23,9 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php
index c959fb10a..67bfa97e3 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'dynamic_get',
 	'dynamic_values'
 );
@@ -22,9 +33,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php
index d4c77dda2..c1b7ce8e9 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'not_required'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/validation_rule/extends_formrule_above.php b/admin/layouts/validation_rule/extends_formrule_above.php
index 7af99fba1..ad8370616 100644
--- a/admin/layouts/validation_rule/extends_formrule_above.php
+++ b/admin/layouts/validation_rule/extends_formrule_above.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'inherit'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-inline form-inline-header">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/validation_rule/extends_formrule_fullwidth.php b/admin/layouts/validation_rule/extends_formrule_fullwidth.php
index 9c7afee5d..19fb17350 100644
--- a/admin/layouts/validation_rule/extends_formrule_fullwidth.php
+++ b/admin/layouts/validation_rule/extends_formrule_fullwidth.php
@@ -12,15 +12,27 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'php'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <div class="form-vertical">
 	<?php foreach($fields as $field): ?>
 		<?php if (in_array($field, $hiddenFields)) : ?>
@@ -29,3 +41,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array();
 		<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 	<?php endforeach; ?>
 </div>
+<?php endif; ?>
diff --git a/admin/layouts/validation_rule/extends_formrule_left.php b/admin/layouts/validation_rule/extends_formrule_left.php
index 5c6226fd3..18159298f 100644
--- a/admin/layouts/validation_rule/extends_formrule_left.php
+++ b/admin/layouts/validation_rule/extends_formrule_left.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'name'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/validation_rule/extends_formrule_right.php b/admin/layouts/validation_rule/extends_formrule_right.php
index fbca02b91..57ab8d289 100644
--- a/admin/layouts/validation_rule/extends_formrule_right.php
+++ b/admin/layouts/validation_rule/extends_formrule_right.php
@@ -12,18 +12,31 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'short_description'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/validation_rule/publishing.php b/admin/layouts/validation_rule/publishing.php
index 07d6717ac..68e3657ce 100644
--- a/admin/layouts/validation_rule/publishing.php
+++ b/admin/layouts/validation_rule/publishing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'created',
 	'created_by',
 	'modified',
@@ -24,9 +35,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/layouts/validation_rule/publlshing.php b/admin/layouts/validation_rule/publlshing.php
index 8ab7976f8..a7ff8580c 100644
--- a/admin/layouts/validation_rule/publlshing.php
+++ b/admin/layouts/validation_rule/publlshing.php
@@ -12,9 +12,20 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
+// get the form
 $form = $displayData->getForm();
 
-$fields = $displayData->get('fields') ?: array(
+// get the layout fields override method name (from layout path/ID)
+$layout_path_array = explode('.', $this->getLayoutId());
+// Since we cannot pass the layout and tab names as parameters to the model method
+// this name combination of tab and layout in the method name is the only work around
+// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name.
+// example of layout name: details_left.php
+// example of method name: getFields_details_left()
+$fields_tab_layout = 'fields_' . $layout_path_array[1];
+
+// get the fields
+$fields = $displayData->get($fields_tab_layout) ?: array(
 	'published',
 	'ordering',
 	'access',
@@ -26,9 +37,11 @@ $fields = $displayData->get('fields') ?: array(
 $hiddenFields = $displayData->get('hidden_fields') ?: array();
 
 ?>
+<?php if ($fields && count((array) $fields)) :?>
 <?php foreach($fields as $field): ?>
 	<?php if (in_array($field, $hiddenFields)) : ?>
 		<?php $form->setFieldAttribute($field, 'type', 'hidden'); ?>
 	<?php endif; ?>
 	<?php echo $form->renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
 <?php endforeach; ?>
+<?php endif; ?>
diff --git a/admin/models/admin_custom_tabs.php b/admin/models/admin_custom_tabs.php
index c5d77729b..2f02ef692 100644
--- a/admin/models/admin_custom_tabs.php
+++ b/admin/models/admin_custom_tabs.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Admin_custom_tabs Model
  */
 class ComponentbuilderModelAdmin_custom_tabs extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'tabs' => array(
+			'fullwidth' => array(
+				'tabs'
+			),
+			'above' => array(
+				'admin_view'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index 781a7682d..9e7504f88 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Admin_fields Model
  */
 class ComponentbuilderModelAdmin_fields extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'fields' => array(
+			'fullwidth' => array(
+				'note_on_views',
+				'addfields'
+			),
+			'above' => array(
+				'admin_view'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index 8330a7c0b..2e2013d7e 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Admin_fields_conditions Model
  */
 class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'conditions' => array(
+			'fullwidth' => array(
+				'note_on_conditions',
+				'addconditions'
+			),
+			'above' => array(
+				'admin_view'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php
index 2eaa3dd13..555d5a17f 100644
--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Admin_fields_relations Model
  */
 class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'relations' => array(
+			'fullwidth' => array(
+				'note_on_relations',
+				'addrelations'
+			),
+			'above' => array(
+				'admin_view'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index c9eee9307..f1060e295 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -18,13 +18,176 @@ use Joomla\Registry\Registry;
  * Componentbuilder Admin_view Model
  */
 class ComponentbuilderModelAdmin_view extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name_single',
+				'name_list',
+				'type',
+				'icon',
+				'icon_add',
+				'icon_category'
+			),
+			'right' => array(
+				'short_description',
+				'description',
+				'add_fadein'
+			),
+			'fullwidth' => array(
+				'note_linked_to_notice'
+			),
+			'above' => array(
+				'system_name'
+			),
+			'under' => array(
+				'not_required'
+			)
+		),
+		'php' => array(
+			'fullwidth' => array(
+				'add_php_ajax',
+				'php_ajaxmethod',
+				'ajax_input',
+				'add_php_getitem',
+				'php_getitem',
+				'add_php_getitems',
+				'php_getitems',
+				'add_php_getitems_after_all',
+				'php_getitems_after_all',
+				'add_php_getlistquery',
+				'php_getlistquery',
+				'add_php_getform',
+				'php_getform',
+				'add_php_before_save',
+				'php_before_save',
+				'add_php_save',
+				'php_save',
+				'add_php_postsavehook',
+				'php_postsavehook',
+				'add_php_allowadd',
+				'php_allowadd',
+				'add_php_allowedit',
+				'php_allowedit',
+				'add_php_before_cancel',
+				'php_before_cancel',
+				'add_php_after_cancel',
+				'php_after_cancel',
+				'add_php_batchcopy',
+				'php_batchcopy',
+				'add_php_batchmove',
+				'php_batchmove',
+				'add_php_before_publish',
+				'php_before_publish',
+				'add_php_after_publish',
+				'php_after_publish',
+				'add_php_before_delete',
+				'php_before_delete',
+				'add_php_after_delete',
+				'php_after_delete',
+				'add_php_document',
+				'php_document'
+			)
+		),
+		'mysql' => array(
+			'left' => array(
+				'mysql_table_engine',
+				'mysql_table_charset',
+				'mysql_table_collate',
+				'mysql_table_row_format',
+				'add_sql',
+				'source',
+				'addtables'
+			),
+			'fullwidth' => array(
+				'sql'
+			)
+		),
+		'custom_import' => array(
+			'fullwidth' => array(
+				'note_beginner_import',
+				'note_advanced_import',
+				'add_custom_import',
+				'php_import_display',
+				'html_import_view',
+				'php_import',
+				'php_import_headers',
+				'php_import_setdata',
+				'php_import_save',
+				'php_import_ext'
+			)
+		),
+		'settings' => array(
+			'fullwidth' => array(
+				'note_on_permissions',
+				'addpermissions',
+				'note_on_tabs',
+				'addtabs',
+				'note_custom_tabs_note',
+				'note_on_linked_views',
+				'addlinked_views'
+			)
+		),
+		'fields' => array(
+			'left' => array(
+				'note_create_edit_notice',
+				'alias_builder_type',
+				'note_alias_builder_custom',
+				'note_alias_builder_default',
+				'alias_builder'
+			),
+			'right' => array(
+				'note_create_edit_buttons'
+			),
+			'fullwidth' => array(
+				'note_create_edit_display'
+			)
+		),
+		'css' => array(
+			'fullwidth' => array(
+				'add_css_view',
+				'css_view',
+				'add_css_views',
+				'css_views'
+			)
+		),
+		'javascript' => array(
+			'fullwidth' => array(
+				'add_javascript_view_file',
+				'javascript_view_file',
+				'add_javascript_view_footer',
+				'javascript_view_footer',
+				'add_javascript_views_file',
+				'javascript_views_file',
+				'add_javascript_views_footer',
+				'javascript_views_footer'
+			)
+		),
+		'custom_buttons' => array(
+			'left' => array(
+				'add_custom_button',
+				'custom_button'
+			),
+			'fullwidth' => array(
+				'php_controller',
+				'php_model',
+				'php_controller_list',
+				'php_model_list'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index f5e2eb08b..41ea25f34 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_admin_views Model
  */
 class ComponentbuilderModelComponent_admin_views extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'views' => array(
+			'fullwidth' => array(
+				'note_on_admin_views',
+				'addadmin_views'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_config.php b/admin/models/component_config.php
index e64c50b5f..6d2601dc4 100644
--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_config Model
  */
 class ComponentbuilderModelComponent_config extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'tweaks' => array(
+			'fullwidth' => array(
+				'addconfig'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php
index bba09a02a..6ad3c4e29 100644
--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_custom_admin_menus Model
  */
 class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'tweaks' => array(
+			'fullwidth' => array(
+				'addcustommenus'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index 221693ada..fa75cb6e0 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_custom_admin_views Model
  */
 class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'views' => array(
+			'fullwidth' => array(
+				'note_on_custom_admin_views',
+				'addcustom_admin_views'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php
index 33ba984a1..3c386aeeb 100644
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_dashboard Model
  */
 class ComponentbuilderModelComponent_dashboard extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'dashboard' => array(
+			'fullwidth' => array(
+				'php_dashboard_methods',
+				'dashboard_tab'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php
index aacab03f7..a055f8093 100644
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@@ -18,13 +18,41 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_files_folders Model
  */
 class ComponentbuilderModelComponent_files_folders extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'basic' => array(
+			'fullwidth' => array(
+				'note_add_files',
+				'addfiles',
+				'note_add_folders',
+				'addfolders'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		),
+		'advance' => array(
+			'fullwidth' => array(
+				'note_add_files_fullpath',
+				'addfilesfullpath',
+				'note_add_folders_fullpath',
+				'addfoldersfullpath',
+				'note_constant_paths'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php
index 969c2cd89..ea0bfa93b 100644
--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_mysql_tweaks Model
  */
 class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'tweaks' => array(
+			'fullwidth' => array(
+				'sql_tweak'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_placeholders.php b/admin/models/component_placeholders.php
index 217c5877f..1255bc8ab 100644
--- a/admin/models/component_placeholders.php
+++ b/admin/models/component_placeholders.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_placeholders Model
  */
 class ComponentbuilderModelComponent_placeholders extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'fullwidth' => array(
+				'addplaceholders'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index b4c67352d..49a5ca3c1 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -18,13 +18,30 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_site_views Model
  */
 class ComponentbuilderModelComponent_site_views extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'views' => array(
+			'fullwidth' => array(
+				'note_on_site_views',
+				'addsite_views'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php
index 5a57c5565..d5736ca78 100644
--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Component_updates Model
  */
 class ComponentbuilderModelComponent_updates extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'updates' => array(
+			'fullwidth' => array(
+				'version_update'
+			),
+			'above' => array(
+				'joomla_component'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index f6751cff1..3715f696e 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -18,13 +18,95 @@ use Joomla\Registry\Registry;
  * Componentbuilder Custom_admin_view Model
  */
 class ComponentbuilderModelCustom_admin_view extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name',
+				'codename',
+				'description',
+				'note_libraries_selection',
+				'libraries',
+				'note_add_language_string'
+			),
+			'right' => array(
+				'icon',
+				'snippet',
+				'note_uikit_snippet',
+				'note_snippet_usage'
+			),
+			'fullwidth' => array(
+				'default'
+			),
+			'above' => array(
+				'system_name',
+				'context'
+			),
+			'under' => array(
+				'not_required'
+			),
+			'rightside' => array(
+				'custom_get',
+				'main_get',
+				'dynamic_get',
+				'dynamic_values'
+			)
+		),
+		'php' => array(
+			'fullwidth' => array(
+				'add_php_ajax',
+				'php_ajaxmethod',
+				'ajax_input',
+				'add_php_document',
+				'php_document',
+				'add_php_view',
+				'php_view',
+				'add_php_jview_display',
+				'php_jview_display',
+				'add_php_jview',
+				'php_jview'
+			)
+		),
+		'javascript_css' => array(
+			'fullwidth' => array(
+				'add_js_document',
+				'js_document',
+				'add_javascript_file',
+				'javascript_file',
+				'add_css_document',
+				'css_document',
+				'add_css',
+				'css'
+			)
+		),
+		'custom_buttons' => array(
+			'left' => array(
+				'add_custom_button',
+				'custom_button'
+			),
+			'fullwidth' => array(
+				'php_controller',
+				'php_model'
+			)
+		),
+		'linked_components' => array(
+			'fullwidth' => array(
+				'note_linked_to_notice'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index 7417e9b5a..ba4bf3597 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -18,13 +18,48 @@ use Joomla\Registry\Registry;
  * Componentbuilder Custom_code Model
  */
 class ComponentbuilderModelCustom_code extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'comment_type',
+				'component',
+				'type',
+				'hashtarget'
+			),
+			'right' => array(
+				'from_line',
+				'to_line',
+				'hashendtarget'
+			),
+			'fullwidth' => array(
+				'path',
+				'note_jcb_placeholder',
+				'code',
+				'note_placeholders_explained'
+			),
+			'above' => array(
+				'target',
+				'system_name',
+				'function_name'
+			),
+			'under' => array(
+				'not_required'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index aa7936163..34de750b9 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -18,13 +18,88 @@ use Joomla\Registry\Registry;
  * Componentbuilder Dynamic_get Model
  */
 class ComponentbuilderModelDynamic_get extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'main' => array(
+			'left' => array(
+				'main_source',
+				'view_table_main',
+				'db_table_main',
+				'select_all',
+				'view_selection',
+				'db_selection'
+			),
+			'right' => array(
+				'plugin_events'
+			),
+			'fullwidth' => array(
+				'php_custom_get',
+				'note_linked_to_notice'
+			),
+			'above' => array(
+				'name',
+				'gettype',
+				'getcustom',
+				'pagination'
+			),
+			'under' => array(
+				'not_required'
+			)
+		),
+		'abacus' => array(
+			'left' => array(
+				'addcalculation'
+			),
+			'fullwidth' => array(
+				'note_calculation_item',
+				'note_calculation_items',
+				'php_calculation'
+			)
+		),
+		'custom_script' => array(
+			'fullwidth' => array(
+				'add_php_before_getitem',
+				'php_before_getitem',
+				'add_php_after_getitem',
+				'php_after_getitem',
+				'add_php_getlistquery',
+				'php_getlistquery',
+				'add_php_before_getitems',
+				'php_before_getitems',
+				'add_php_after_getitems',
+				'php_after_getitems',
+				'add_php_router_parse',
+				'php_router_parse'
+			)
+		),
+		'joint' => array(
+			'fullwidth' => array(
+				'join_view_table',
+				'join_db_table'
+			)
+		),
+		'tweak' => array(
+			'fullwidth' => array(
+				'filter',
+				'where',
+				'order',
+				'group',
+				'global'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/field.php b/admin/models/field.php
index b467b9b67..5299679ee 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -18,13 +18,74 @@ use Joomla\Registry\Registry;
  * Componentbuilder Field Model
  */
 class ComponentbuilderModelField extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'set_properties' => array(
+			'fullwidth' => array(
+				'note_select_field_type',
+				'note_filter_information'
+			),
+			'above' => array(
+				'fieldtype',
+				'name',
+				'catid'
+			),
+			'under' => array(
+				'not_required'
+			)
+		),
+		'database' => array(
+			'left' => array(
+				'datatype',
+				'datalenght',
+				'datalenght_other',
+				'datadefault',
+				'datadefault_other'
+			),
+			'right' => array(
+				'indexes',
+				'null_switch',
+				'store',
+				'note_whmcs_encryption'
+			),
+			'fullwidth' => array(
+				'note_no_database_settings_needed',
+				'note_database_settings_needed'
+			)
+		),
+		'scripts' => array(
+			'left' => array(
+				'add_css_view',
+				'css_view',
+				'add_css_views',
+				'css_views'
+			),
+			'right' => array(
+				'add_javascript_view_footer',
+				'javascript_view_footer',
+				'add_javascript_views_footer',
+				'javascript_views_footer'
+			)
+		),
+		'type_info' => array(
+			'fullwidth' => array(
+				'helpnote',
+				'xml'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 563b5181f..034c109d5 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -18,13 +18,54 @@ use Joomla\Registry\Registry;
  * Componentbuilder Fieldtype Model
  */
 class ComponentbuilderModelFieldtype extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'catid',
+				'short_description'
+			),
+			'right' => array(
+				'description'
+			),
+			'fullwidth' => array(
+				'note_on_fields',
+				'properties',
+				'not_required'
+			),
+			'above' => array(
+				'name'
+			)
+		),
+		'database_defaults' => array(
+			'left' => array(
+				'has_defaults',
+				'datatype',
+				'datalenght',
+				'datalenght_other',
+				'datadefault',
+				'datadefault_other'
+			),
+			'right' => array(
+				'indexes',
+				'null_switch',
+				'store',
+				'note_whmcs_encryption'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index c5b7003fc..76de5c965 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -18,13 +18,45 @@ use Joomla\Registry\Registry;
  * Componentbuilder Help_document Model
  */
 class ComponentbuilderModelHelp_document extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'target',
+				'groups',
+				'location',
+				'admin_view',
+				'site_view'
+			),
+			'right' => array(
+				'type',
+				'url',
+				'article'
+			),
+			'fullwidth' => array(
+				'content'
+			),
+			'above' => array(
+				'title',
+				'alias'
+			),
+			'under' => array(
+				'not_required'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index f03b74ec4..aba4c89d1 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -18,13 +18,199 @@ use Joomla\Registry\Registry;
  * Componentbuilder Joomla_component Model
  */
 class ComponentbuilderModelJoomla_component extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name',
+				'name_code',
+				'component_version',
+				'debug_linenr',
+				'add_placeholders',
+				'mvc_versiondate',
+				'note_version_options_one',
+				'note_version_options_two',
+				'note_version_options_three',
+				'short_description',
+				'description',
+				'copyright'
+			),
+			'right' => array(
+				'companyname',
+				'author',
+				'email',
+				'website',
+				'add_license',
+				'license_type',
+				'note_whmcs_lisencing_note',
+				'whmcs_key',
+				'whmcs_url',
+				'whmcs_buy_link',
+				'license',
+				'bom',
+				'image'
+			),
+			'above' => array(
+				'system_name'
+			),
+			'under' => array(
+				'not_required'
+			)
+		),
+		'libs_helpers' => array(
+			'fullwidth' => array(
+				'creatuserhelper',
+				'adduikit',
+				'addfootable',
+				'add_email_helper',
+				'add_php_helper_both',
+				'php_helper_both',
+				'add_php_helper_admin',
+				'php_helper_admin',
+				'add_admin_event',
+				'php_admin_event',
+				'add_php_helper_site',
+				'php_helper_site',
+				'add_site_event',
+				'php_site_event',
+				'add_javascript',
+				'javascript',
+				'add_css_admin',
+				'css_admin',
+				'add_css_site',
+				'css_site'
+			)
+		),
+		'dynamic_integration' => array(
+			'left' => array(
+				'add_update_server',
+				'update_server_url',
+				'update_server_target',
+				'note_update_server_note_ftp',
+				'note_update_server_note_zip',
+				'note_update_server_note_other',
+				'update_server',
+				'add_sales_server',
+				'sales_server'
+			),
+			'right' => array(
+				'translation_tool',
+				'note_crowdin',
+				'crowdin_project_identifier',
+				'crowdin_project_api_key',
+				'crowdin_username',
+				'crowdin_account_api_key'
+			)
+		),
+		'readme' => array(
+			'left' => array(
+				'addreadme',
+				'readme'
+			),
+			'right' => array(
+				'note_readme'
+			)
+		),
+		'dash_install' => array(
+			'left' => array(
+				'dashboard_type'
+			),
+			'right' => array(
+				'note_dynamic_dashboard',
+				'dashboard',
+				'note_botton_component_dashboard'
+			),
+			'fullwidth' => array(
+				'add_php_preflight_install',
+				'php_preflight_install',
+				'add_php_preflight_update',
+				'php_preflight_update',
+				'add_php_postflight_install',
+				'php_postflight_install',
+				'add_php_postflight_update',
+				'php_postflight_update',
+				'add_php_method_uninstall',
+				'php_method_uninstall'
+			)
+		),
+		'mysql' => array(
+			'fullwidth' => array(
+				'add_sql',
+				'sql',
+				'add_sql_uninstall',
+				'sql_uninstall'
+			)
+		),
+		'settings' => array(
+			'left' => array(
+				'note_moved_views',
+				'spacer_hr_one',
+				'note_mysql_tweak_options',
+				'spacer_hr_two',
+				'note_add_custom_menus',
+				'spacer_hr_three',
+				'note_add_config'
+			),
+			'right' => array(
+				'note_component_files_folders',
+				'spacer_hr_four',
+				'add_menu_prefix',
+				'menu_prefix',
+				'spacer_hr_five',
+				'to_ignore_note',
+				'toignore',
+				'spacer_hr_six',
+				'jcb_export_package_note',
+				'export_key',
+				'joomla_source_link',
+				'export_buy_link'
+			),
+			'fullwidth' => array(
+				'spacer_hr_seven',
+				'note_on_contributors',
+				'addcontributors',
+				'emptycontributors',
+				'number'
+			)
+		),
+		'dynamic_build_beta' => array(
+			'fullwidth' => array(
+				'note_buildcomp_dynamic_mysql',
+				'buildcomp',
+				'buildcompsql'
+			)
+		),
+		'admin_views' => array(
+			'fullwidth' => array(
+				'note_on_admin_views',
+				'note_display_component_admin_views'
+			)
+		),
+		'site_views' => array(
+			'fullwidth' => array(
+				'note_on_site_views',
+				'note_display_component_site_views'
+			)
+		),
+		'custom_admin_views' => array(
+			'fullwidth' => array(
+				'note_on_custom_admin_views',
+				'note_display_component_custom_admin_views'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/language.php b/admin/models/language.php
index 962f68a39..afc984dfe 100644
--- a/admin/models/language.php
+++ b/admin/models/language.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Language Model
  */
 class ComponentbuilderModelLanguage extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name'
+			),
+			'right' => array(
+				'langtag'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index c5758ca07..5d042d195 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -18,13 +18,28 @@ use Joomla\Registry\Registry;
  * Componentbuilder Language_translation Model
  */
 class ComponentbuilderModelLanguage_translation extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'fullwidth' => array(
+				'source',
+				'translation',
+				'components'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/layout.php b/admin/models/layout.php
index d6a4cd8f6..5b0f5c243 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -18,13 +18,52 @@ use Joomla\Registry\Registry;
  * Componentbuilder Layout Model
  */
 class ComponentbuilderModelLayout extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name',
+				'alias',
+				'description',
+				'note_libraries_selection',
+				'libraries',
+				'note_add_language_string'
+			),
+			'right' => array(
+				'snippet',
+				'note_uikit_snippet',
+				'note_snippet_usage'
+			),
+			'fullwidth' => array(
+				'layout'
+			),
+			'under' => array(
+				'not_required'
+			),
+			'rightside' => array(
+				'dynamic_get',
+				'dynamic_values'
+			)
+		),
+		'custom_script' => array(
+			'fullwidth' => array(
+				'add_php_view',
+				'php_view'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/library.php b/admin/models/library.php
index cc26b5365..b31ee1b58 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -18,13 +18,65 @@ use Joomla\Registry\Registry;
  * Componentbuilder Library Model
  */
 class ComponentbuilderModelLibrary extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'behaviour' => array(
+			'left' => array(
+				'note_library_instruction',
+				'libraries'
+			),
+			'right' => array(
+				'description'
+			),
+			'fullwidth' => array(
+				'note_no_behaviour_one',
+				'note_yes_behaviour_one',
+				'note_build_in_behaviour_one',
+				'addconditions',
+				'php_setdocument'
+			),
+			'above' => array(
+				'name',
+				'how',
+				'type'
+			),
+			'under' => array(
+				'not_required'
+			)
+		),
+		'config' => array(
+			'fullwidth' => array(
+				'note_no_behaviour_two',
+				'note_yes_behaviour_two',
+				'note_build_in_behaviour_two',
+				'note_display_library_config'
+			)
+		),
+		'files_folders_urls' => array(
+			'fullwidth' => array(
+				'note_no_behaviour_three',
+				'note_build_in_behaviour_three',
+				'note_display_library_files_folders_urls'
+			)
+		),
+		'linked' => array(
+			'fullwidth' => array(
+				'note_linked_to_notice'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/library_config.php b/admin/models/library_config.php
index 8c78ade47..928f52550 100644
--- a/admin/models/library_config.php
+++ b/admin/models/library_config.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Library_config Model
  */
 class ComponentbuilderModelLibrary_config extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'tweaks' => array(
+			'fullwidth' => array(
+				'addconfig'
+			),
+			'above' => array(
+				'library'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php
index 103945f17..4ea18f984 100644
--- a/admin/models/library_files_folders_urls.php
+++ b/admin/models/library_files_folders_urls.php
@@ -18,13 +18,43 @@ use Joomla\Registry\Registry;
  * Componentbuilder Library_files_folders_urls Model
  */
 class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'basic' => array(
+			'fullwidth' => array(
+				'note_add_urls',
+				'addurls',
+				'note_add_files',
+				'addfiles',
+				'note_add_folders',
+				'addfolders'
+			),
+			'above' => array(
+				'library'
+			)
+		),
+		'advance' => array(
+			'fullwidth' => array(
+				'note_add_files_fullpath',
+				'addfilesfullpath',
+				'note_add_folders_fullpath',
+				'addfoldersfullpath',
+				'note_constant_paths'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php
index e11f07c94..085e4e3e2 100644
--- a/admin/models/placeholder.php
+++ b/admin/models/placeholder.php
@@ -18,13 +18,32 @@ use Joomla\Registry\Registry;
  * Componentbuilder Placeholder Model
  */
 class ComponentbuilderModelPlaceholder extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'target'
+			),
+			'right' => array(
+				'value'
+			),
+			'fullwidth' => array(
+				'note_placeholders_placedin'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/server.php b/admin/models/server.php
index 1bc18a6e9..ce83d23e8 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -18,13 +18,46 @@ use Joomla\Registry\Registry;
  * Componentbuilder Server Model
  */
 class ComponentbuilderModelServer extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'username',
+				'host',
+				'port',
+				'path'
+			),
+			'right' => array(
+				'authentication',
+				'password',
+				'private',
+				'private_key',
+				'secret'
+			),
+			'fullwidth' => array(
+				'note_ftp_signature',
+				'signature',
+				'note_ssh_security',
+				'not_required'
+			),
+			'above' => array(
+				'name',
+				'protocol'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index e9656b354..c834dc5b0 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -18,13 +18,98 @@ use Joomla\Registry\Registry;
  * Componentbuilder Site_view Model
  */
 class ComponentbuilderModelSite_view extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name',
+				'codename',
+				'description',
+				'note_libraries_selection',
+				'libraries',
+				'note_add_language_string'
+			),
+			'right' => array(
+				'snippet',
+				'note_uikit_snippet',
+				'note_snippet_usage'
+			),
+			'fullwidth' => array(
+				'default'
+			),
+			'above' => array(
+				'system_name',
+				'context'
+			),
+			'under' => array(
+				'not_required'
+			),
+			'rightside' => array(
+				'custom_get',
+				'main_get',
+				'dynamic_get',
+				'dynamic_values'
+			)
+		),
+		'php' => array(
+			'fullwidth' => array(
+				'add_php_ajax',
+				'php_ajaxmethod',
+				'ajax_input',
+				'add_php_document',
+				'php_document',
+				'add_php_view',
+				'php_view',
+				'add_php_jview_display',
+				'php_jview_display',
+				'add_php_jview',
+				'php_jview'
+			)
+		),
+		'javascript_css' => array(
+			'fullwidth' => array(
+				'add_javascript_file',
+				'javascript_file',
+				'add_js_document',
+				'js_document',
+				'add_css_document',
+				'css_document',
+				'add_css',
+				'css'
+			)
+		),
+		'custom_buttons' => array(
+			'left' => array(
+				'add_custom_button'
+			),
+			'right' => array(
+				'button_position'
+			),
+			'fullwidth' => array(
+				'note_custom_toolbar_placeholder',
+				'custom_button',
+				'php_controller',
+				'php_model'
+			)
+		),
+		'linked_components' => array(
+			'fullwidth' => array(
+				'note_linked_to_notice'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/snippet.php b/admin/models/snippet.php
index b5b657a0d..1eaeb22ee 100644
--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@@ -18,13 +18,50 @@ use Joomla\Registry\Registry;
  * Componentbuilder Snippet Model
  */
 class ComponentbuilderModelSnippet extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'type',
+				'heading',
+				'description',
+				'usage'
+			),
+			'right' => array(
+				'snippet'
+			),
+			'above' => array(
+				'name',
+				'url',
+				'library'
+			)
+		),
+		'contributor' => array(
+			'left' => array(
+				'contributor_company',
+				'contributor_website'
+			),
+			'right' => array(
+				'contributor_name',
+				'contributor_email'
+			),
+			'fullwidth' => array(
+				'note_contributor_details'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php
index b918872e8..0fd4d5192 100644
--- a/admin/models/snippet_type.php
+++ b/admin/models/snippet_type.php
@@ -18,13 +18,29 @@ use Joomla\Registry\Registry;
  * Componentbuilder Snippet_type Model
  */
 class ComponentbuilderModelSnippet_type extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name'
+			),
+			'right' => array(
+				'description'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/template.php b/admin/models/template.php
index be901b9f1..90b76ef76 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -18,13 +18,52 @@ use Joomla\Registry\Registry;
  * Componentbuilder Template Model
  */
 class ComponentbuilderModelTemplate extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'details' => array(
+			'left' => array(
+				'name',
+				'alias',
+				'description',
+				'note_libraries_selection',
+				'libraries',
+				'note_add_language_string'
+			),
+			'right' => array(
+				'snippet',
+				'note_snippet_usage',
+				'note_uikit_snippet'
+			),
+			'fullwidth' => array(
+				'template'
+			),
+			'under' => array(
+				'not_required'
+			),
+			'rightside' => array(
+				'dynamic_get',
+				'dynamic_values'
+			)
+		),
+		'custom_script' => array(
+			'fullwidth' => array(
+				'add_php_view',
+				'php_view'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php
index 678ad8f12..5ac0ca8b3 100644
--- a/admin/models/validation_rule.php
+++ b/admin/models/validation_rule.php
@@ -18,13 +18,35 @@ use Joomla\Registry\Registry;
  * Componentbuilder Validation_rule Model
  */
 class ComponentbuilderModelValidation_rule extends JModelAdmin
-{    
+{
+	/**
+	 * The tab layout fields array.
+	 *
+	 * @var      array
+	 */
+	protected $tabLayoutFields = array(
+		'extends_formrule' => array(
+			'left' => array(
+				'name'
+			),
+			'right' => array(
+				'short_description'
+			),
+			'fullwidth' => array(
+				'php'
+			),
+			'above' => array(
+				'inherit'
+			)
+		)
+	);
+
 	/**
 	 * @var        string    The prefix to use with controller messages.
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_COMPONENTBUILDER';
-    
+
 	/**
 	 * The type alias for this content type.
 	 *
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 0bb88511e..4bef149a0 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>29th June, 2019</creationDate>
+	<creationDate>1st July, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-- 
2.40.1


From 9e6233c64f6c8c48727b39dc24f36fef1b43a425 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 5 Jul 2019 01:53:54 +0200
Subject: [PATCH 24/26] Fixed gh-434 to add the missing table path if not set.
 Resolved gh-427 to allow numbers in the name of a field. Impoved the compiler
 by adding a method to set the Lang Content array.

---
 README.md                                     |   6 +-
 admin/README.txt                              |   6 +-
 admin/compiler/joomla_3/Helper.php            |  28 +-
 admin/compiler/joomla_3/Helper_site.php       |  28 +-
 admin/config.xml                              |  14 +
 admin/helpers/compiler/a_Get.php              |  48 +-
 admin/helpers/compiler/c_Fields.php           | 156 ++--
 admin/helpers/compiler/e_Interpretation.php   | 769 +++++++++---------
 admin/helpers/compiler/f_Infusion.php         |  20 +-
 admin/helpers/componentbuilder.php            |  48 +-
 .../en-GB/en-GB.com_componentbuilder.ini      | 142 ++--
 .../en-GB/en-GB.com_componentbuilder.sys.ini  |  70 +-
 admin/models/admin_view.php                   |   7 +
 admin/models/custom_admin_view.php            |   7 +
 admin/models/custom_code.php                  |   7 +
 admin/models/dynamic_get.php                  |   7 +
 admin/models/field.php                        |   7 +
 admin/models/fieldtype.php                    |   7 +
 admin/models/joomla_component.php             |   7 +
 admin/models/layout.php                       |   7 +
 admin/models/library.php                      |   7 +
 admin/models/placeholder.php                  |   7 +
 admin/models/site_view.php                    |   7 +
 admin/models/template.php                     |   7 +
 componentbuilder.xml                          |   2 +-
 script.php                                    |   2 +-
 site/helpers/componentbuilder.php             |  48 +-
 27 files changed, 790 insertions(+), 681 deletions(-)

diff --git a/README.md b/README.md
index 19b30191e..5fb70e3b0 100644
--- a/README.md
+++ b/README.md
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 1st July, 2019
++ *Last Build*: 4th July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211430**
-+ *Field count*: **1142**
++ *Line count*: **211563**
++ *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/README.txt b/admin/README.txt
index 19b30191e..5fb70e3b0 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 1st July, 2019
++ *Last Build*: 4th July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211430**
-+ *Field count*: **1142**
++ *Line count*: **211563**
++ *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php
index 2841876b0..b6ce01384 100644
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@@ -496,38 +496,42 @@ abstract class ###Component###Helper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = '###Component###', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $Component = '###Component###', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php
index 6164ce694..9213fb793 100644
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@@ -139,38 +139,42 @@ abstract class ###Component###Helper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = '###Component###', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $Component = '###Component###', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
diff --git a/admin/config.xml b/admin/config.xml
index b976865fa..20204b87b 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -249,6 +249,20 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS</option>
 		</field>
+		<!-- Field_name_builder Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="field_name_builder"
+			label="COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC</option>
+		</field>
 		<!-- Spacer_hr_seven Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_seven" hr="true" class="spacer_hr_seven" />
 		<!-- Api Field. Type: User. (joomla) -->
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 61c84de40..29186c266 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -1581,6 +1581,29 @@ class Get
 		return $component;
 	}
 
+	/**
+	 * set the language content values to language content array
+	 * 
+	 * @param   string   $target    The target area for the language string
+	 * @param   string   $language  The language key string
+	 * @param   string   $string    The language string
+	 * @param   boolean  $addPrefix The switch to add langPrefix
+	 *
+	 * @return  void
+	 * 
+	 */
+	public function setLangContent($target, $language, $string, $addPrefix = false)
+	{
+		if ($addPrefix &&  !isset($this->langContent[$target][$this->langPrefix . '_' . $language]))
+		{
+			$this->langContent[$target][$this->langPrefix . '_' . $language] = trim($string);
+		}
+		elseif (!isset($this->langContent[$target][$language]))
+		{
+			$this->langContent[$target][$language] = trim($string);
+		}
+	}
+
 	/**
 	 * Get all Admin View Data
 	 * 
@@ -1708,7 +1731,7 @@ class Get
 					$tab['name'] = (isset($tab['name']) && ComponentbuilderHelper::checkString($tab['name'])) ? $tab['name'] : 'Tab';
 					// set lang
 					$tab['lang'] = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tab['view'], 'U') . '_' . ComponentbuilderHelper::safeString($tab['name'], 'U');
-					$this->langContent['both'][$tab['lang']] = trim($tab['name']);
+					$this->setLangContent('both', $tab['lang'], $tab['name']);
 					// set code name
 					$tab['code'] = ComponentbuilderHelper::safeString($tab['name']);
 					// check if the permissions for the tab should be added
@@ -1747,8 +1770,8 @@ class Get
 						$tab['lang_permission'] = $tab['lang'] . '_TAB_PERMISSION';
 						$tab['lang_permission_desc'] = $tab['lang'] . '_TAB_PERMISSION_DESC';
 						$tab['lang_permission_title'] = $this->placeholders[$this->hhh . 'Views' . $this->hhh] . ' View ' . $tab['name'] . ' Tab';
-						$this->langContent['both'][$tab['lang_permission']] = $tab['lang_permission_title'];
-						$this->langContent['both'][$tab['lang_permission_desc']] = 'Allow the users in this group to view ' . $tab['name'] . ' Tab of ' . $this->placeholders[$this->hhh . 'views' . $this->hhh];
+						$this->setLangContent('both', $tab['lang_permission'], $tab['lang_permission_title']);
+						$this->setLangContent('both', $tab['lang_permission_desc'], 'Allow the users in this group to view ' . $tab['name'] . ' Tab of ' . $this->placeholders[$this->hhh . 'views' . $this->hhh]);
 						// set the sort key
 						$tab['sortKey'] = ComponentbuilderHelper::safeString($tab['lang_permission_title']);
 					}
@@ -2036,7 +2059,7 @@ class Get
 							if ('default' !== $check_column_name)
 							{
 								$column_name_lang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($name_list, 'U') . '_' . ComponentbuilderHelper::safeString($relationsValue['column_name'], 'U');
-								$this->langContent['admin'][$column_name_lang] = trim($relationsValue['column_name']);
+								$this->setLangContent('admin', $column_name_lang, $relationsValue['column_name']);
 								$this->listHeadOverRide[$name_list][(int) $relationsValue['listfield']] = $column_name_lang;
 							}
 						}
@@ -4369,12 +4392,11 @@ class Get
 		{
 			return false;
 		}
-		// only load if string is not already set
+		// build lang key
 		$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
-		if (!isset($this->langContent[$this->lang][$keyLang]))
-		{
-			$this->langContent[$this->lang][$keyLang] = trim($string);
-		}
+		// set the language string
+		$this->setLangContent($this->lang, $keyLang, $string);
+
 		return $keyLang;
 	}
 
@@ -6334,12 +6356,10 @@ class Get
 					{
 						continue;
 					}
-					// only load if string is not already set
+					// build lang key
 					$keyLang = $this->langPrefix . '_' . $_keyLang;
-					if (!isset($this->langContent[$this->lang][$keyLang]))
-					{
-						$this->langContent[$this->lang][$keyLang] = trim($lang);
-					}
+					// set lang content string
+					$this->setLangContent($this->lang, $keyLang, $lang);
 					// reverse the placeholders
 					foreach ($langStringTargets as $langStringTarget)
 					{
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index c3a411af7..4eb73f5cd 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -380,42 +380,42 @@ class Fields extends Structure
 			$langView = $this->langPrefix . '_' . $this->placeholders[$this->hhh . 'VIEW' . $this->hhh];
 			$langViews = $this->langPrefix . '_' . $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh];
 			// set default lang
-			$this->langContent[$this->lang][$langView] = $view['settings']->name_single;
-			$this->langContent[$this->lang][$langViews] = $view['settings']->name_list;
+			$this->setLangContent($this->lang, $langView, $view['settings']->name_single);
+			$this->setLangContent($this->lang, $langViews, $view['settings']->name_list);
 			// set global item strings
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_ARCHIVED'] = "%s " . $view['settings']->name_list . " archived.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_ARCHIVED_1'] = "%s " . $view['settings']->name_single . " archived.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_CHECKED_IN_0'] = "No " . $view['settings']->name_single . " successfully checked in.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_CHECKED_IN_1'] = "%d " . $view['settings']->name_single . " successfully checked in.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_CHECKED_IN_MORE'] = "%d " . $view['settings']->name_list . " successfully checked in.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_DELETED'] = "%s " . $view['settings']->name_list . " deleted.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_DELETED_1'] = "%s " . $view['settings']->name_single . " deleted.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_FEATURED'] = "%s " . $view['settings']->name_list . " featured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_FEATURED_1'] = "%s " . $view['settings']->name_single . " featured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_PUBLISHED'] = "%s " . $view['settings']->name_list . " published.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_PUBLISHED_1'] = "%s " . $view['settings']->name_single . " published.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_TRASHED'] = "%s " . $view['settings']->name_list . " trashed.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_TRASHED_1'] = "%s " . $view['settings']->name_single . " trashed.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNFEATURED'] = "%s " . $view['settings']->name_list . " unfeatured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNFEATURED_1'] = "%s " . $view['settings']->name_single . " unfeatured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNPUBLISHED'] = "%s " . $view['settings']->name_list . " unpublished.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNPUBLISHED_1'] = "%s " . $view['settings']->name_single . " unpublished.";
-			$this->langContent[$this->lang][$langViews . '_BATCH_OPTIONS'] = "Batch process the selected " . $view['settings']->name_list;
-			$this->langContent[$this->lang][$langViews . '_BATCH_TIP'] = "All changes will be applied to all selected " . $view['settings']->name_list;
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_ARCHIVED', "%s " . $view['settings']->name_list . " archived.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_ARCHIVED_1', "%s " . $view['settings']->name_single . " archived.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_CHECKED_IN_0', "No " . $view['settings']->name_single . " successfully checked in.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_CHECKED_IN_1', "%d " . $view['settings']->name_single . " successfully checked in.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_CHECKED_IN_MORE', "%d " . $view['settings']->name_list . " successfully checked in.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_DELETED', "%s " . $view['settings']->name_list . " deleted.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_DELETED_1', "%s " . $view['settings']->name_single . " deleted.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_FEATURED', "%s " . $view['settings']->name_list . " featured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_FEATURED_1', "%s " . $view['settings']->name_single . " featured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_PUBLISHED', "%s " . $view['settings']->name_list . " published.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_PUBLISHED_1', "%s " . $view['settings']->name_single . " published.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_TRASHED', "%s " . $view['settings']->name_list . " trashed.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_TRASHED_1', "%s " . $view['settings']->name_single . " trashed.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNFEATURED', "%s " . $view['settings']->name_list . " unfeatured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNFEATURED_1', "%s " . $view['settings']->name_single . " unfeatured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNPUBLISHED', "%s " . $view['settings']->name_list . " unpublished.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNPUBLISHED_1', "%s " . $view['settings']->name_single . " unpublished.");
+			$this->setLangContent($this->lang, $langViews . '_BATCH_OPTIONS', "Batch process the selected " . $view['settings']->name_list);
+			$this->setLangContent($this->lang, $langViews . '_BATCH_TIP', "All changes will be applied to all selected " . $view['settings']->name_list);
 			// set some basic defaults
-			$this->langContent[$this->lang][$langView . '_ERROR_UNIQUE_ALIAS'] = "Another " . $view['settings']->name_single . " has the same alias.";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created Date";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was created.";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_LABEL'] = "Modified Date";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was modified.";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created By";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created this " . $view['settings']->name_single . ".";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_LABEL'] = "Modified By";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_DESC'] = "The last user that modified this " . $view['settings']->name_single . ".";
-			$this->langContent[$this->lang][$langView . '_ORDERING_LABEL'] = "Ordering";
-			$this->langContent[$this->lang][$langView . '_VERSION_LABEL'] = "Revision";
-			$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
-			$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
+			$this->setLangContent($this->lang, $langView . '_ERROR_UNIQUE_ALIAS', "Another " . $view['settings']->name_single . " has the same alias.");
+			$this->setLangContent($this->lang, $langView . '_CREATED_DATE_LABEL', "Created Date");
+			$this->setLangContent($this->lang, $langView . '_CREATED_DATE_DESC', "The date this " . $view['settings']->name_single . " was created.");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_DATE_LABEL', "Modified Date");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_DATE_DESC', "The date this " . $view['settings']->name_single . " was modified.");
+			$this->setLangContent($this->lang, $langView . '_CREATED_BY_LABEL', "Created By");
+			$this->setLangContent($this->lang, $langView . '_CREATED_BY_DESC', "The user that created this " . $view['settings']->name_single . ".");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_BY_LABEL', "Modified By");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_BY_DESC', "The last user that modified this " . $view['settings']->name_single . ".");
+			$this->setLangContent($this->lang, $langView . '_ORDERING_LABEL', "Ordering");
+			$this->setLangContent($this->lang, $langView . '_VERSION_LABEL', "Revision");
+			$this->setLangContent($this->lang, $langView . '_VERSION_DESC', "A count of the number of times this " . $view['settings']->name_single . " has been revised.");
+			$this->setLangContent($this->lang, $langView . '_SAVE_WARNING', "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.");
 			// check what type of field builder to use
 			if ($this->fieldBuilderType == 1)
 			{
@@ -1214,7 +1214,7 @@ class Fields extends Structure
 		if ($setType === 'option')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(1) . $taber . $this->_t(1) . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$field .= PHP_EOL . $this->_t(1) . $taber . $this->_t(1) . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 			$field .= PHP_EOL . $this->_t(1) . $taber . $this->_t(1) . "<field";
 			$optionSet = '';
 			foreach ($fieldAttributes as $property => $value)
@@ -1236,9 +1236,9 @@ class Fields extends Structure
 							{
 								// has other value then text
 								list($v, $t) = explode('|', $option);
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $t;
+								$this->setLangContent($this->lang, $langValue, $t);
 								// no add to option set
 								$optionSet .= PHP_EOL . $this->_t(1) . $taber . $this->_t(2) . '<option value="' . $v . '">' . PHP_EOL . $this->_t(1) . $taber . $this->_t(3) . $langValue . '</option>';
 								$optionArray[$v] = $langValue;
@@ -1246,9 +1246,9 @@ class Fields extends Structure
 							else
 							{
 								// text is also the value
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($option, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($option, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $option;
+								$this->setLangContent($this->lang, $langValue, $option);
 								// no add to option set
 								$optionSet .= PHP_EOL . $this->_t(2) . $taber . $this->_t(1) . '<option value="' . $option . '">' . PHP_EOL . $this->_t(2) . $taber . $this->_t(2) . $langValue . '</option>';
 								$optionArray[$option] = $langValue;
@@ -1262,9 +1262,9 @@ class Fields extends Structure
 						{
 							// has other value then text
 							list($v, $t) = explode('|', $value);
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $t;
+							$this->setLangContent($this->lang, $langValue, $t);
 							// no add to option set
 							$optionSet .= PHP_EOL . $this->_t(2) . $taber . $this->_t(1) . '<option value="' . $v . '">' . PHP_EOL . $this->_t(2) . $taber . $this->_t(2) . $langValue . '</option>';
 							$optionArray[$v] = $langValue;
@@ -1272,9 +1272,9 @@ class Fields extends Structure
 						else
 						{
 							// text is also the value
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($value, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($value, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $value;
+							$this->setLangContent($this->lang, $langValue, $value);
 							// no add to option set
 							$optionSet .= PHP_EOL . $this->_t(2) . $taber . $this->_t(1) . '<option value="' . $value . '">' . PHP_EOL . $this->_t(2) . $taber . $this->_t(2) . $langValue . '</option>';
 							$optionArray[$value] = $langValue;
@@ -1306,7 +1306,7 @@ class Fields extends Structure
 		elseif ($setType === 'plain')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 			$field .= PHP_EOL . $this->_t(2) . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1320,7 +1320,7 @@ class Fields extends Structure
 		elseif ($setType === 'spacer')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
+			$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
 			$field .= PHP_EOL . $this->_t(2) . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1337,7 +1337,7 @@ class Fields extends Structure
 			if ($typeName === 'repeatable')
 			{
 				// now add to the field set
-				$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 				$field .= PHP_EOL . $this->_t(2) . "<field";
 				$fieldsSet = array();
 				foreach ($fieldAttributes as $property => $value)
@@ -1412,9 +1412,9 @@ class Fields extends Structure
 									// now add to the field set
 									$field .= $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray, null, $r_taber);
 									// set lang (just incase)
-									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 									// add to lang array
-									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 									// if label was set use instead
 									if (ComponentbuilderHelper::checkString($r_langLabel))
 									{
@@ -1437,7 +1437,7 @@ class Fields extends Structure
 			elseif ($typeName === 'subform')
 			{
 				// now add to the field set
-				$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 				$field .= PHP_EOL . $this->_t(2) . $taber . "<field";
 				$fieldsSet = array();
 				foreach ($fieldAttributes as $property => $value)
@@ -1529,9 +1529,9 @@ class Fields extends Structure
 									// now add to the field set
 									$field .= $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray, null, $r_taber);
 									// set lang (just incase)
-									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 									// add to lang array
-									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 									// if label was set use instead
 									if (ComponentbuilderHelper::checkString($r_langLabel))
 									{
@@ -1553,7 +1553,7 @@ class Fields extends Structure
 		elseif ($setType === 'custom')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
+			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
 			$field .= PHP_EOL . $this->_t(2) . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1602,7 +1602,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
 
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1624,9 +1624,9 @@ class Fields extends Structure
 							{
 								// has other value then text
 								list($v, $t) = explode('|', $option);
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $t;
+								$this->setLangContent($this->lang, $langValue, $t);
 								// no add to option set
 								$optionXML->addAttribute('value', $v);
 								$optionArray[$v] = $langValue;
@@ -1634,9 +1634,9 @@ class Fields extends Structure
 							else
 							{
 								// text is also the value
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($option, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($option, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $option;
+								$this->setLangContent($this->lang, $langValue, $option);
 								// no add to option set
 								$optionXML->addAttribute('value', $option);
 								$optionArray[$option] = $langValue;
@@ -1652,9 +1652,9 @@ class Fields extends Structure
 						{
 							// has other value then text
 							list($v, $t) = explode('|', $value);
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $t;
+							$this->setLangContent($this->lang, $langValue, $t);
 							// no add to option set
 							$optionXML->addAttribute('value', $v);
 							$optionArray[$v] = $langValue;
@@ -1662,9 +1662,9 @@ class Fields extends Structure
 						else
 						{
 							// text is also the value
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($value, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($value, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $value;
+							$this->setLangContent($this->lang, $langValue, $value);
 							// no add to option set
 							$optionXML->addAttribute('value', $value);
 							$optionArray[$value] = $langValue;
@@ -1683,7 +1683,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
 
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1697,7 +1697,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla)";
 
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1714,7 +1714,7 @@ class Fields extends Structure
 			{
 				// now add to the field set
 				$field->fieldXML = new SimpleXMLElement('<field/>');
-				$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (depreciated)";
+				$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (depreciated)";
 
 				foreach ($fieldAttributes as $property => $value)
 				{
@@ -1791,9 +1791,9 @@ class Fields extends Structure
 									// now add to the field set
 									ComponentbuilderHelper::xmlAppend($fieldSetXML, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 									// set lang (just incase)
-									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 									// add to lang array
-									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 									// if label was set use instead
 									if (ComponentbuilderHelper::checkString($r_langLabel))
 									{
@@ -1814,7 +1814,7 @@ class Fields extends Structure
 			{
 				// now add to the field set
 				$field->fieldXML = new SimpleXMLElement('<field/>');
-				$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
+				$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
 				// add all properties
 				foreach ($fieldAttributes as $property => $value)
 				{
@@ -1918,9 +1918,9 @@ class Fields extends Structure
 										// now add to the field set
 										ComponentbuilderHelper::xmlAppend($form, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 										// set lang (just incase)
-										$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+										$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 										// add to lang array
-										$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+										$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 										// if label was set use instead
 										if (ComponentbuilderHelper::checkString($r_langLabel))
 										{
@@ -1942,7 +1942,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom)";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
@@ -2328,9 +2328,9 @@ class Fields extends Structure
 						$customLabel = $xmlValue;
 					}
 					// set lang key
-					$langValue = $langView . '_' . ComponentbuilderHelper::safeString($name . ' ' . $property['name'], 'U');
+					$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($name . ' ' . $property['name'], true);
 					// add to lang array
-					$this->langContent[$this->lang][$langValue] = $xmlValue;
+					$this->setLangContent($this->lang, $langValue, $xmlValue);
 					// use lang value
 					$xmlValue = $langValue;
 				}
@@ -2560,16 +2560,16 @@ class Fields extends Structure
 				$tempName = $view_name_single . ' category';
 			}
 			// set lang
-			$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
+			$listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($tempName, true);
 			// add to lang array
-			$this->langContent[$this->lang][$listLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
+			$this->setLangContent($this->lang, $listLangName, ComponentbuilderHelper::safeString($tempName, 'W'));
 		}
 		else
 		{
 			// set lang (just incase)
-			$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
+			$listLangName = $langView . '_' .ComponentbuilderHelper::safeFieldName($name, true);
 			// add to lang array
-			$this->langContent[$this->lang][$listLangName] = ComponentbuilderHelper::safeString($name, 'W');
+			$this->setLangContent($this->lang, $listLangName, ComponentbuilderHelper::safeString($name, 'W'));
 			// if label was set use instead
 			if (ComponentbuilderHelper::checkString($langLabel))
 			{
@@ -3009,9 +3009,9 @@ class Fields extends Structure
 					// temp holder for name
 					$tempName = $data['custom']['label'] . ' Group';
 					// set lang
-					$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
+					$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeFieldName($tempName, true);
 					// add to lang array
-					$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
+					$this->setLangContent($this->lang, $groupLangName, ComponentbuilderHelper::safeString($tempName, 'W'));
 					// build the Group Control
 					$this->setGroupControl[$data['type']] = $groupLangName;
 					// JFORM_GETGROUPS_PHP <<<DYNAMIC>>>
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 0dcdffe72..cc60884ad 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -1487,9 +1487,9 @@ class Interpretation extends Fields
 		{
 			// set the lang
 			$lang = ComponentbuilderHelper::safeString('com_' . $this->componentCodeName . '_menu_' . $viewName_single, 'U');
-			$this->langContent['adminsys'][$lang . '_TITLE'] = 'Create ' . $view['settings']->name_single;
-			$this->langContent['adminsys'][$lang . '_OPTION'] = 'Create ' . $view['settings']->name_single;
-			$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->short_description;
+			$this->setLangContent('adminsys', $lang . '_TITLE', 'Create ' . $view['settings']->name_single);
+			$this->setLangContent('adminsys', $lang . '_OPTION', 'Create ' . $view['settings']->name_single);
+			$this->setLangContent('adminsys', $lang . '_DESC', $view['settings']->short_description);
 			//start loading xml
 			$xml = '<?xml version="1.0" encoding="utf-8" ?>';
 			$xml .= PHP_EOL . '<metadata>';
@@ -1517,9 +1517,9 @@ class Interpretation extends Fields
 		{
 			// set the lang
 			$lang = ComponentbuilderHelper::safeString('com_' . $this->componentCodeName . '_menu_' . $view['settings']->code, 'U');
-			$this->langContent['adminsys'][$lang . '_TITLE'] = $view['settings']->name;
-			$this->langContent['adminsys'][$lang . '_OPTION'] = $view['settings']->name;
-			$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->description;
+			$this->setLangContent('adminsys', $lang . '_TITLE', $view['settings']->name);
+			$this->setLangContent('adminsys', $lang . '_OPTION', $view['settings']->name);
+			$this->setLangContent('adminsys', $lang . '_DESC',  $view['settings']->description);
 			//start loading xml
 			$xml = '<?xml version="1.0" encoding="utf-8" ?>';
 			$xml .= PHP_EOL . '<metadata>';
@@ -2330,10 +2330,7 @@ class Interpretation extends Fields
 			$accessCheck[] = $this->_t(3) . "\$app = JFactory::getApplication();";
 			// set lang
 			$langKeyWord = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Not authorised to view ' . $view['settings']->code . '!', 'U');
-			if (!isset($this->langContent['site'][$langKeyWord]))
-			{
-				$this->langContent['site'][$langKeyWord] = 'Not authorised to view ' . $view['settings']->code . '!';
-			}
+			$this->setLangContent('site', $langKeyWord, 'Not authorised to view ' . $view['settings']->code . '!');
 			$accessCheck[] = $this->_t(3) . "\$app->enqueueMessage(JText:" . ":_('" . $langKeyWord . "'), 'error');";
 			$accessCheck[] = $redirectMessage;
 			$accessCheck[] = $this->_t(3) . "\$app->redirect(" . $redirectString . ");";
@@ -2412,10 +2409,7 @@ class Interpretation extends Fields
 			{
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "\$app = JFactory::getApplication();";
 				$langKeyWoord = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Not found or access denied', 'U');
-				if (!isset($this->langContent[$this->lang][$langKeyWoord]))
-				{
-					$this->langContent[$this->lang][$langKeyWoord] = 'Not found, or access denied.';
-				}
+				$this->setLangContent($this->lang, $langKeyWoord, 'Not found, or access denied.');
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " If no data is found redirect to default page and show warning.";
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "\$app->enqueueMessage(JText:" . ":_('" . $langKeyWoord . "'), 'warning');";
 				if ('site' === $this->target)
@@ -3608,7 +3602,7 @@ class Interpretation extends Fields
 					// Load to lang
 					$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($custom_button['name'], 'U');
 					$keyCode = ComponentbuilderHelper::safeString($custom_button['name']);
-					$this->langContent[$this->lang][$keyLang] = trim($custom_button['name']);
+					$this->setLangContent($this->lang, $keyLang, $custom_button['name']);
 					// load the button
 					if (3 !== $type && ($custom_button['target'] != 2 || $this->target === 'site'))
 					{
@@ -6541,83 +6535,83 @@ class Interpretation extends Fields
 		// Trigger Event: jcb_ce_onBeforeBuildAdminLang
 		$this->triggerEvent('jcb_ce_onBeforeBuildAdminLang', array(&$this->componentContext, &$this->langContent['admin'], &$this->langPrefix, &$componentName));
 		// start loding the defaults
-		$this->langContent['adminsys'][$this->langPrefix] = $componentName;
-		$this->langContent['adminsys'][$this->langPrefix . '_CONFIGURATION'] = $componentName . ' Configuration';
-		$this->langContent['admin'][$this->langPrefix] = $componentName;
-		$this->langContent['admin'][$this->langPrefix . '_BACK'] = 'Back';
-		$this->langContent['admin'][$this->langPrefix . '_DASH'] = 'Dashboard';
-		$this->langContent['admin'][$this->langPrefix . '_VERSION'] = 'Version';
-		$this->langContent['admin'][$this->langPrefix . '_DATE'] = 'Date';
-		$this->langContent['admin'][$this->langPrefix . '_AUTHOR'] = 'Author';
-		$this->langContent['admin'][$this->langPrefix . '_WEBSITE'] = 'Website';
-		$this->langContent['admin'][$this->langPrefix . '_LICENSE'] = 'License';
-		$this->langContent['admin'][$this->langPrefix . '_CONTRIBUTORS'] = 'Contributors';
-		$this->langContent['admin'][$this->langPrefix . '_CONTRIBUTOR'] = 'Contributor';
-		$this->langContent['admin'][$this->langPrefix . '_DASHBOARD'] = $componentName . ' Dashboard';
-		$this->langContent['admin'][$this->langPrefix . '_SAVE_SUCCESS'] = "Great! Item successfully saved.";
-		$this->langContent['admin'][$this->langPrefix . '_SAVE_WARNING'] = "The value already existed so please select another.";
-		$this->langContent['admin'][$this->langPrefix . '_HELP_MANAGER'] = "Help";
-		$this->langContent['admin'][$this->langPrefix . '_NEW'] = "New";
-		$this->langContent['admin'][$this->langPrefix . '_CLOSE_NEW'] = "Close & New";
-		$this->langContent['admin'][$this->langPrefix . '_CREATE_NEW_S'] = "Create New %s";
-		$this->langContent['admin'][$this->langPrefix . '_EDIT_S'] = "Edit %s";
-		$this->langContent['admin'][$this->langPrefix . '_KEEP_ORIGINAL_STATE'] = "- Keep Original State -";
-		$this->langContent['admin'][$this->langPrefix . '_KEEP_ORIGINAL_ACCESS'] = "- Keep Original Access -";
-		$this->langContent['admin'][$this->langPrefix . '_KEEP_ORIGINAL_CATEGORY'] = "- Keep Original Category -";
-		$this->langContent['admin'][$this->langPrefix . '_PUBLISHED'] = 'Published';
-		$this->langContent['admin'][$this->langPrefix . '_INACTIVE'] = 'Inactive';
-		$this->langContent['admin'][$this->langPrefix . '_ARCHIVED'] = 'Archived';
-		$this->langContent['admin'][$this->langPrefix . '_TRASHED'] = 'Trashed';
-		$this->langContent['admin'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
-		$this->langContent['admin'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
+		$this->setLangContent('adminsys', $this->langPrefix, $componentName);
+		$this->setLangContent('adminsys', $this->langPrefix . '_CONFIGURATION', $componentName . ' Configuration');
+		$this->setLangContent('admin', $this->langPrefix, $componentName);
+		$this->setLangContent('admin', $this->langPrefix . '_BACK', 'Back');
+		$this->setLangContent('admin', $this->langPrefix . '_DASH', 'Dashboard');
+		$this->setLangContent('admin', $this->langPrefix . '_VERSION', 'Version');
+		$this->setLangContent('admin', $this->langPrefix . '_DATE', 'Date');
+		$this->setLangContent('admin', $this->langPrefix . '_AUTHOR', 'Author');
+		$this->setLangContent('admin', $this->langPrefix . '_WEBSITE', 'Website');
+		$this->setLangContent('admin', $this->langPrefix . '_LICENSE', 'License');
+		$this->setLangContent('admin', $this->langPrefix . '_CONTRIBUTORS', 'Contributors');
+		$this->setLangContent('admin', $this->langPrefix . '_CONTRIBUTOR', 'Contributor');
+		$this->setLangContent('admin', $this->langPrefix . '_DASHBOARD', $componentName . ' Dashboard');
+		$this->setLangContent('admin', $this->langPrefix . '_SAVE_SUCCESS', "Great! Item successfully saved.");
+		$this->setLangContent('admin', $this->langPrefix . '_SAVE_WARNING', "The value already existed so please select another.");
+		$this->setLangContent('admin', $this->langPrefix . '_HELP_MANAGER', "Help");
+		$this->setLangContent('admin', $this->langPrefix . '_NEW', "New");
+		$this->setLangContent('admin', $this->langPrefix . '_CLOSE_NEW', "Close & New");
+		$this->setLangContent('admin', $this->langPrefix . '_CREATE_NEW_S', "Create New %s");
+		$this->setLangContent('admin', $this->langPrefix . '_EDIT_S', "Edit %s");
+		$this->setLangContent('admin', $this->langPrefix . '_KEEP_ORIGINAL_STATE', "- Keep Original State -");
+		$this->setLangContent('admin', $this->langPrefix . '_KEEP_ORIGINAL_ACCESS', "- Keep Original Access -");
+		$this->setLangContent('admin', $this->langPrefix . '_KEEP_ORIGINAL_CATEGORY', "- Keep Original Category -");
+		$this->setLangContent('admin', $this->langPrefix . '_PUBLISHED', 'Published');
+		$this->setLangContent('admin', $this->langPrefix . '_INACTIVE', 'Inactive');
+		$this->setLangContent('admin', $this->langPrefix . '_ARCHIVED', 'Archived');
+		$this->setLangContent('admin', $this->langPrefix . '_TRASHED', 'Trashed');
+		$this->setLangContent('admin', $this->langPrefix . '_NO_ACCESS_GRANTED', "No Access Granted!");
+		$this->setLangContent('admin', $this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED', "Not found or access denied!");
 		if ($this->componentData->add_license && $this->componentData->license_type == 3)
 		{
-			$this->langContent['admin']['NIE_REG_NIE'] = "<br /><br /><center><h1>License not set for " . $componentName . ".</h1><p>Notify your administrator!<br />The license can be obtained from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.</p></center>";
+			$this->setLangContent('admin', 'NIE_REG_NIE', "<br /><br /><center><h1>License not set for " . $componentName . ".</h1><p>Notify your administrator!<br />The license can be obtained from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.</p></center>");
 		}
 		// add the langug files needed to import and export data
 		if ($this->addEximport)
 		{
-			$this->langContent['admin'][$this->langPrefix . '_EXPORT_FAILED'] = "Export Failed";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FAILED'] = "Import Failed";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_TITLE'] = "Data Importer";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_NO_IMPORT_TYPE_FOUND'] = "Import type not found.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'] = "Package to import not found.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_ERROR'] = "Import error.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SUCCESS'] = "Great! Import successful.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_WARNIMPORTFILE'] = "Warning, import file error.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_NO_FILE_SELECTED'] = "No import file selected.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_FILE'] = "Please select a file to import.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS'] = "Please link all columns.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY'] = "Please enter the file directory.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_WARNIMPORTUPLOADERROR'] = "Warning, import upload error.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'] = "Please enter the file directory.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'] = "Path does not have a valid file.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'] = "Does not have a valid file type.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_ENTER_A_URL'] = "Please enter a url.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_INVALID_URL'] = "Invalid url.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_CONTINUE'] = "Continue";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FROM_UPLOAD'] = "Upload";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SELECT_FILE'] = "Select File";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_UPLOAD_BOTTON'] = "Upload File";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FROM_DIRECTORY'] = "Directory";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SELECT_FILE_DIRECTORY'] = "Set the path to file";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_GET_BOTTON'] = "Get File";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FROM_URL'] = "URL";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SELECT_FILE_URL'] = "Enter file URL";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_UPDATE_DATA'] = "Import Data";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FORMATS_ACCEPTED'] = "formats accepted";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'] = "Link File to Table Columns";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_TABLE_COLUMNS'] = "Table Columns";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FILE_COLUMNS'] = "File Columns";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_PLEASE_SELECT_COLUMN'] = "-- Please Select Column --";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_IGNORE_COLUMN'] = "-- Ignore This Column --";
+			$this->setLangContent('admin', $this->langPrefix . '_EXPORT_FAILED', "Export Failed");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FAILED', "Import Failed");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_TITLE', "Data Importer");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_NO_IMPORT_TYPE_FOUND', "Import type not found.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE', "Package to import not found.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_ERROR', "Import error.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SUCCESS', "Great! Import successful.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_WARNIMPORTFILE', "Warning, import file error.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_NO_FILE_SELECTED', "No import file selected.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_FILE', "Please select a file to import.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', "Please link all columns.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', "Please enter the file directory.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_WARNIMPORTUPLOADERROR', "Warning, import upload error.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY', "Please enter the file directory.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE', "Path does not have a valid file.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE', "Does not have a valid file type.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_ENTER_A_URL', "Please enter a url.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_INVALID_URL', "Invalid url.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_CONTINUE', "Continue");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FROM_UPLOAD', "Upload");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SELECT_FILE', "Select File");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_UPLOAD_BOTTON', "Upload File");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FROM_DIRECTORY', "Directory");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SELECT_FILE_DIRECTORY', "Set the path to file");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_GET_BOTTON', "Get File");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FROM_URL', "URL");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SELECT_FILE_URL', "Enter file URL");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_UPDATE_DATA', "Import Data");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FORMATS_ACCEPTED', "formats accepted");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_LINK_FILE_TO_TABLE_COLUMNS', "Link File to Table Columns");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_TABLE_COLUMNS', "Table Columns");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FILE_COLUMNS', "File Columns");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_PLEASE_SELECT_COLUMN', "-- Please Select Column --");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_IGNORE_COLUMN', "-- Ignore This Column --");
 		}
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
 		{
 			foreach ($this->langContent['both'] as $keylang => $langval)
 			{
-				$this->langContent['admin'][$keylang] = $langval;
+				$this->setLangContent('admin', $keylang, $langval);
 			}
 		}
 		// check if the both admin array is set
@@ -6625,7 +6619,7 @@ class Interpretation extends Fields
 		{
 			foreach ($this->langContent['bothadmin'] as $keylang => $langval)
 			{
-				$this->langContent['admin'][$keylang] = $langval;
+				$this->setLangContent('admin', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['admin']) && ComponentbuilderHelper::checkArray($this->langContent['admin']))
@@ -6651,33 +6645,33 @@ class Interpretation extends Fields
 		// Trigger Event: jcb_ce_onBeforeBuildSiteLang
 		$this->triggerEvent('jcb_ce_onBeforeBuildSiteLang', array(&$this->componentContext, &$this->langContent['site'], &$this->langPrefix, &$componentName));
 		// add final list of needed lang strings
-		$this->langContent['site'][$this->langPrefix] = $componentName;
+		$this->setLangContent('site', $this->langPrefix, $componentName);
 		// some more defaults
-		$this->langContent['site']['JTOOLBAR_APPLY'] = "Save";
-		$this->langContent['site']['JTOOLBAR_SAVE_AS_COPY'] = "Save as Copy";
-		$this->langContent['site']['JTOOLBAR_SAVE'] = "Save & Close";
-		$this->langContent['site']['JTOOLBAR_SAVE_AND_NEW'] = "Save & New";
-		$this->langContent['site']['JTOOLBAR_CANCEL'] = "Cancel";
-		$this->langContent['site']['JTOOLBAR_CLOSE'] = "Close";
-		$this->langContent['site']['JTOOLBAR_HELP'] = "Help";
-		$this->langContent['site']['JGLOBAL_FIELD_ID_LABEL'] = "ID";
-		$this->langContent['site']['JGLOBAL_FIELD_ID_DESC'] = "Record number in the database.";
-		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_LABEL'] = "Modified Date";
-		$this->langContent['site']['COM_CONTENT_FIELD_MODIFIED_DESC'] = "The last date this item was modified.";
-		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_LABEL'] = "Modified By";
-		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_DESC'] = "The user who did the last modification.";
-		$this->langContent['site'][$this->langPrefix . '_NEW'] = "New";
-		$this->langContent['site'][$this->langPrefix . '_CREATE_NEW_S'] = "Create New %s";
-		$this->langContent['site'][$this->langPrefix . '_EDIT_S'] = "Edit %s";
-		$this->langContent['site'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
-		$this->langContent['site'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
+		$this->setLangContent('site', 'JTOOLBAR_APPLY', "Save");
+		$this->setLangContent('site', 'JTOOLBAR_SAVE_AS_COPY', "Save as Copy");
+		$this->setLangContent('site', 'JTOOLBAR_SAVE', "Save & Close");
+		$this->setLangContent('site', 'JTOOLBAR_SAVE_AND_NEW', "Save & New");
+		$this->setLangContent('site', 'JTOOLBAR_CANCEL', "Cancel");
+		$this->setLangContent('site', 'JTOOLBAR_CLOSE', "Close");
+		$this->setLangContent('site', 'JTOOLBAR_HELP', "Help");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_ID_LABEL', "ID");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_ID_DESC', "Record number in the database.");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_MODIFIED_LABEL', "Modified Date");
+		$this->setLangContent('site', 'COM_CONTENT_FIELD_MODIFIED_DESC', "The last date this item was modified.");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_MODIFIED_BY_LABEL', "Modified By");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_MODIFIED_BY_DESC', "The user who did the last modification.");
+		$this->setLangContent('site', $this->langPrefix . '_NEW', "New");
+		$this->setLangContent('site', $this->langPrefix . '_CREATE_NEW_S', "Create New %s");
+		$this->setLangContent('site', $this->langPrefix . '_EDIT_S', "Edit %s");
+		$this->setLangContent('site', $this->langPrefix . '_NO_ACCESS_GRANTED', "No Access Granted!");
+		$this->setLangContent('site', $this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED', "Not found or access denied!");
 
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
 		{
 			foreach ($this->langContent['both'] as $keylang => $langval)
 			{
-				$this->langContent['site'][$keylang] = $langval;
+				$this->setLangContent('site', $keylang, $langval);
 			}
 		}
 		// check if the both site array is set
@@ -6685,7 +6679,7 @@ class Interpretation extends Fields
 		{
 			foreach ($this->langContent['bothsite'] as $keylang => $langval)
 			{
-				$this->langContent['site'][$keylang] = $langval;
+				$this->setLangContent('site', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['site']) && ComponentbuilderHelper::checkArray($this->langContent['site']))
@@ -6711,16 +6705,16 @@ class Interpretation extends Fields
 		// Trigger Event: jcb_ce_onBeforeBuildSiteSysLang
 		$this->triggerEvent('jcb_ce_onBeforeBuildSiteSysLang', array(&$this->componentContext, &$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
 		// add final list of needed lang strings
-		$this->langContent['sitesys'][$this->langPrefix] = $componentName;
-		$this->langContent['sitesys'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
-		$this->langContent['sitesys'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
+		$this->setLangContent('sitesys', $this->langPrefix, $componentName);
+		$this->setLangContent('sitesys', $this->langPrefix . '_NO_ACCESS_GRANTED', "No Access Granted!");
+		$this->setLangContent('sitesys', $this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED', "Not found or access denied!");
 
 		// check if the both site array is set
 		if (isset($this->langContent['bothsite']) && ComponentbuilderHelper::checkArray($this->langContent['bothsite']))
 		{
 			foreach ($this->langContent['bothsite'] as $keylang => $langval)
 			{
-				$this->langContent['sitesys'][$keylang] = $langval;
+				$this->setLangContent('sitesys', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['sitesys']) && ComponentbuilderHelper::checkArray($this->langContent['sitesys']))
@@ -6750,7 +6744,7 @@ class Interpretation extends Fields
 		{
 			foreach ($this->langContent['bothadmin'] as $keylang => $langval)
 			{
-				$this->langContent['adminsys'][$keylang] = $langval;
+				$this->setLangContent('adminsys', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['adminsys']) && ComponentbuilderHelper::checkArray($this->langContent['adminsys']))
@@ -7384,15 +7378,9 @@ class Interpretation extends Fields
 			// set id lang
 			$idLangName = $langView . '_ID';
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$statusLangName]))
-			{
-				$this->langContent[$this->lang][$statusLangName] = 'Status';
-			}
+			$this->setLangContent($this->lang, $statusLangName, 'Status');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$idLangName]))
-			{
-				$this->langContent[$this->lang][$idLangName] = 'Id';
-			}
+			$this->setLangContent($this->lang, $idLangName, 'Id');
 			// set default
 			$head = '<tr>';
 			$head .= PHP_EOL . $this->_t(1) . "<?php if (\$this->canEdit&& \$this->canState): ?>";
@@ -7777,10 +7765,7 @@ class Interpretation extends Fields
 			/// set the values to use in search latter
 			$searchTabs[$tabCodeName] = $tabNr;
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$tabLangName]))
-			{
-				$this->langContent[$this->lang][$tabLangName] = $tabName;
-			}
+			$this->setLangContent($this->lang, $tabLangName, $tabName);
 			// check if linked view belongs to this tab
 			$buildLayout = true;
 			$linkedViewId = '';
@@ -7988,10 +7973,7 @@ class Interpretation extends Fields
 		// set default publishing tab lang
 		$tabLangName = $langView . '_PUBLISHING';
 		// add to lang array
-		if (!isset($this->langContent[$this->lang][$tabLangName]))
-		{
-			$this->langContent[$this->lang][$tabLangName] = 'Publishing';
-		}
+		$this->setLangContent($this->lang, $tabLangName, 'Publishing');
 		// the default publishing items
 		$items = array('left' => array(), 'right' => array());
 		// Setup the default (custom) fields
@@ -8194,10 +8176,7 @@ class Interpretation extends Fields
 			// set permissions tab code name
 			$tabCodeName = 'permissions';
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$tabLangName]))
-			{
-				$this->langContent[$this->lang][$tabLangName] = 'Permissions';
-			}
+			$this->setLangContent($this->lang, $tabLangName, 'Permissions');
 			// set the permissions tab
 			$tabs .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php if (\$this->canDo->get('core.admin')) : ?>";
 			$tabs .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $view_name_single . "Tab', '" . $tabCodeName . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
@@ -8705,15 +8684,9 @@ class Interpretation extends Fields
 			// make sure only first link is used as togeler
 			$firstLink = true;
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$statusLangName]))
-			{
-				$this->langContent[$this->lang][$statusLangName] = 'Status';
-			}
+			$this->setLangContent($this->lang, $statusLangName, 'Status');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$idLangName]))
-			{
-				$this->langContent[$this->lang][$idLangName] = 'Id';
-			}
+			$this->setLangContent($this->lang, $idLangName, 'Id');
 			$head .= PHP_EOL . $this->_t(1) . "<tr>";
 			// set controller for data hiding options
 			$controller = 1;
@@ -9089,7 +9062,7 @@ class Interpretation extends Fields
 			{
 				// Load to lang
 				$keyLang = $this->langPrefix . '_' . $custom_button['NAME'];
-				$this->langContent[$this->lang][$keyLang] = ComponentbuilderHelper::safeString($custom_button['name'], 'Ww');
+				$this->setLangContent($this->lang, $keyLang, ComponentbuilderHelper::safeString($custom_button['name'], 'Ww'));
 				// add cpanel button
 				$buttons[] = $this->_t(2) . "if (\$this->canDo->get('" . $custom_button['link'] . ".access'))";
 				$buttons[] = $this->_t(2) . "{";
@@ -9143,10 +9116,7 @@ class Interpretation extends Fields
 				$method[] = $this->_t(1) . "}";
 				// add to lang array
 				$lankey = $this->langPrefix . "_ACCESS_TO_" . $custom_button['NAME'] . "_FAILED";
-				if (!isset($this->langContent[$this->lang][$lankey]))
-				{
-					$this->langContent[$this->lang][$lankey] = 'Access to ' . $custom_button['link'] . ' was denied.';
-				}
+				$this->setLangContent($this->lang, $lankey, 'Access to ' . $custom_button['link'] . ' was denied.');
 			}
 
 			return implode(PHP_EOL, $method);
@@ -9288,10 +9258,7 @@ class Interpretation extends Fields
 			$method[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Redirect to import view.";
 			// add to lang array
 			$selectImportFileNote = $this->langPrefix . "_IMPORT_SELECT_FILE_FOR_" . ComponentbuilderHelper::safeString($viewName_list, 'U');
-			if (!isset($this->langContent[$this->lang][$selectImportFileNote]))
-			{
-				$this->langContent[$this->lang][$selectImportFileNote] = 'Select the file to import data to ' . $viewName_list . '.';
-			}
+			$this->setLangContent($this->lang, $selectImportFileNote, 'Select the file to import data to ' . $viewName_list . '.');
 			$method[] = $this->_t(4) . "\$message = JText:" . ":_('" . $selectImportFileNote . "');";
 			// if this view has custom script it must have as custom import (model, veiw, controller)
 			if (isset($this->importCustomScripts[$viewName_list]) && $this->importCustomScripts[$viewName_list])
@@ -9323,10 +9290,7 @@ class Interpretation extends Fields
 			// main lang prefix
 			$langExport = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Export Data', 'U');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$langExport]))
-			{
-				$this->langContent[$this->lang][$langExport] = 'Export Data';
-			}
+			$this->setLangContent($this->lang, $langExport, 'Export Data');
 			$button = array();
 			$button[] = PHP_EOL . PHP_EOL . $this->_t(3) . "if (\$this->canDo->get('core.export') && \$this->canDo->get('" . $viewName_single . ".export'))";
 			$button[] = $this->_t(3) . "{";
@@ -9345,10 +9309,7 @@ class Interpretation extends Fields
 			// main lang prefix
 			$langImport = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$langImport]))
-			{
-				$this->langContent[$this->lang][$langImport] = 'Import Data';
-			}
+			$this->setLangContent($this->lang, $langImport, 'Import Data');
 			$button = array();
 			$button[] = PHP_EOL . PHP_EOL . $this->_t(2) . "if (\$this->canDo->get('core.import') && \$this->canDo->get('" . $viewName_single . ".import'))";
 			$button[] = $this->_t(2) . "{";
@@ -12330,7 +12291,7 @@ class Interpretation extends Fields
 			// set lang strings
 			$viewNameLang_readonly = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single . ' readonly', 'U');
 			// load to lang
-			$this->langContent[$this->lang][$viewNameLang_readonly] = $view['settings']->name_single . ' :: Readonly';
+			$this->setLangContent($this->lang, $viewNameLang_readonly, $view['settings']->name_single . ' :: Readonly');
 
 			// build toolbar
 			$toolBar = "JFactory::getApplication()->input->set('hidemainmenu', true);";
@@ -12343,8 +12304,8 @@ class Interpretation extends Fields
 			$viewNameLang_new = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single . ' New', 'U');
 			$viewNameLang_edit = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single . ' Edit', 'U');
 			// load to lang
-			$this->langContent[$this->lang][$viewNameLang_new] = 'A New ' . $view['settings']->name_single;
-			$this->langContent[$this->lang][$viewNameLang_edit] = 'Editing the ' . $view['settings']->name_single;
+			$this->setLangContent($this->lang, $viewNameLang_new, 'A New ' . $view['settings']->name_single);
+			$this->setLangContent($this->lang, $viewNameLang_edit, 'Editing the ' . $view['settings']->name_single);
 			// build toolbar
 			$toolBar = "JFactory::getApplication()->input->set('hidemainmenu', true);";
 			$toolBar .= PHP_EOL . $this->_t(2) . "\$user = JFactory::getUser();";
@@ -13212,7 +13173,7 @@ class Interpretation extends Fields
 					$langName = 'Add&nbsp;' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'W') . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U') . '_ADD';
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					$counter++;
 				}
 				if (isset($view['dashboard_list']) && $view['dashboard_list'] == 1)
@@ -13240,7 +13201,7 @@ class Interpretation extends Fields
 					$langName = ComponentbuilderHelper::safeString($view['settings']->name_list, 'W') . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					$counter++;
 				}
 				if (isset($this->categoryBuilder[$name_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$name_list]))
@@ -13265,7 +13226,7 @@ class Interpretation extends Fields
 					{
 						// add to lang
 						$langKey = $this->langPrefix . '_DASHBOARD_' . ComponentbuilderHelper::safeString($otherViews, 'U') . '_' . ComponentbuilderHelper::safeString($catCode, 'U');
-						$this->langContent[$this->lang][$langKey] = $langName;
+						$this->setLangContent($this->lang, $langKey, $langName);
 						// get image type
 						$type = ComponentbuilderHelper::imageInfo($view['settings']->icon_category);
 						if ($type)
@@ -13482,7 +13443,7 @@ class Interpretation extends Fields
 					$langName = $menu['settings']->name . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $menu['settings']->CODE;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					// set icon
 					if ($counter == 0)
 					{
@@ -13512,7 +13473,7 @@ class Interpretation extends Fields
 					$langName = $menu['settings']->name . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $menu['settings']->CODE;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					// set icon
 					$this->lastCustomDashboardIcon[$nr] = ", '" . $type . $menu['settings']->code . "'";
 				}
@@ -13542,7 +13503,7 @@ class Interpretation extends Fields
 					$langName = $menu['name'] . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $nameUpper;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 
 					// if this is a link build the icon values with pipe
 					if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
@@ -13590,7 +13551,7 @@ class Interpretation extends Fields
 					$langName = $menu['name'] . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $nameUpper;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 
 					// if this is a link build the icon values with pipe
 					if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
@@ -13622,7 +13583,7 @@ class Interpretation extends Fields
 			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
 			{
 				$menus .= "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_DASHBOARD'), 'index.php?option=com_" . $codeName . "&view=" . $codeName . "', \$submenu === '" . $codeName . "');";
-				$this->langContent[$this->lang][$lang . '_DASHBOARD'] = 'Dashboard';
+				$this->setLangContent($this->lang, $lang . '_DASHBOARD', 'Dashboard');
 			}
 			$catArray = array();
 			foreach ($this->componentData->admin_views as $view)
@@ -13651,7 +13612,7 @@ class Interpretation extends Fields
 						$tab = $this->_t(1);
 					}
 					$menus .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), 'index.php?option=com_" . $codeName . "&view=" . $nameList . "', \$submenu === '" . $nameList . "');";
-					$this->langContent[$this->lang][$lang . "_" . $nameUpper] = $view['settings']->name_list;
+					$this->setLangContent($this->lang, $lang . "_" . $nameUpper, $view['settings']->name_list);
 					// check if category has another name
 					if (isset($this->catOtherName[$nameList]) && ComponentbuilderHelper::checkArray($this->catOtherName[$nameList]))
 					{
@@ -13693,8 +13654,8 @@ class Interpretation extends Fields
 					$menus .= PHP_EOL . $this->_t(3) . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "_FIELDS'), 'index.php?option=com_fields&context=com_" . $codeName . "." . $nameSingle . "', \$submenu === 'fields.fields');";
 					$menus .= PHP_EOL . $this->_t(3) . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "_FIELDS_GROUPS'), 'index.php?option=com_fields&view=groups&context=com_" . $codeName . "." . $nameSingle . "', \$submenu === 'fields.groups');";
 					$menus .= PHP_EOL . $this->_t(2) . "}";
-					$this->langContent[$this->lang][$lang . "_" . $nameUpper . "_FIELDS"] = $view['settings']->name_list . ' Fields';
-					$this->langContent[$this->lang][$lang . "_" . $nameUpper . "_FIELDS_GROUPS"] = $view['settings']->name_list . ' Field Groups';
+					$this->setLangContent($this->lang, $lang . "_" . $nameUpper . "_FIELDS", $view['settings']->name_list . ' Fields');
+					$this->setLangContent($this->lang, $lang . "_" . $nameUpper . "_FIELDS_GROUPS", $view['settings']->name_list . ' Field Groups');
 					// build uninstall script for fields
 					$this->uninstallScriptBuilder[$nameSingle] = 'com_' . $codeName . '.' . $nameSingle;
 					$this->uninstallScriptFields[$nameSingle] = $nameSingle;
@@ -13793,13 +13754,13 @@ class Interpretation extends Fields
 			if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
 			{
 
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$custom .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), '" . $menu['link'] . "', \$submenu === '" . $nameList . "');";
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$custom .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), 'index.php?option=com_" . $codeName . "&view=" . $nameList . "', \$submenu === '" . $nameList . "');";
 			}
@@ -13837,13 +13798,13 @@ class Interpretation extends Fields
 			}
 			if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
 			{
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), '" . $menu['link'] . "', \$submenu === '" . $nameList . "');";
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), 'index.php?option=com_" . $codeName . "&view=" . $nameList . "', \$submenu === '" . $nameList . "');";
 			}
@@ -13886,11 +13847,11 @@ class Interpretation extends Fields
 			// add the prefix
 			if ($addPrefix == 1)
 			{
-				$this->langContent['adminsys'][$lang] = $prefix . $this->componentData->name;
+				$this->setLangContent('adminsys', $lang, $prefix . $this->componentData->name);
 			}
 			else
 			{
-				$this->langContent['adminsys'][$lang] = $this->componentData->name;
+				$this->setLangContent('adminsys', $lang, $this->componentData->name);
 			}
 			// loop over the admin views
 			foreach ($this->componentData->admin_views as $view)
@@ -13902,7 +13863,7 @@ class Interpretation extends Fields
 					$nameList = ComponentbuilderHelper::safeString($view['settings']->name_list);
 					$nameUpper = ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
 					$menus .= PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $nameList . '">' . $lang . '_' . $nameUpper . '</menu>';
-					$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $view['settings']->name_list;
+					$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $view['settings']->name_list);
 				}
 			}
 			if (isset($this->lastCustomMainMenu) && ComponentbuilderHelper::checkArray($this->lastCustomMainMenu))
@@ -13930,13 +13891,13 @@ class Interpretation extends Fields
 				{
 					if (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && $view['adminview'] == $menu['before'])
 					{
-						$this->langContent['adminsys'][$lang . '_' . $menu['settings']->CODE] = $menu['settings']->name;
+						$this->setLangContent('adminsys', $lang . '_' . $menu['settings']->CODE, $menu['settings']->name);
 						// add custom menu
 						$customMenu .= PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $menu['settings']->code . '">' . $lang . '_' . $menu['settings']->CODE . '</menu>';
 					}
 					elseif (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && empty($menu['before']))
 					{
-						$this->langContent['adminsys'][$lang . '_' . $menu['settings']->CODE] = $menu['settings']->name;
+						$this->setLangContent('adminsys', $lang . '_' . $menu['settings']->CODE, $menu['settings']->name);
 						// add custom menu
 						$this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $menu['settings']->code . '">' . $lang . '_' . $menu['settings']->CODE . '</menu>';
 					}
@@ -13955,7 +13916,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// sanitize url
 						if (strpos($menu['link'], 'http') === false)
 						{
@@ -13977,7 +13938,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name_code']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// add custom menu
 						$customMenu .= PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $nameList . '">' . $lang . '_' . $nameUpper . '</menu>';
 					}
@@ -13988,7 +13949,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// sanitize url
 						if (strpos($menu['link'], 'http') === false)
 						{
@@ -14010,7 +13971,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name_code']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// add custom menu
 						$this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $nameList . '">' . $lang . '_' . $nameUpper . '</menu>';
 					}
@@ -14271,7 +14232,7 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkArray($bucket))
 				{
 					// setup lang
-					$this->langContent[$this->lang][$lang . '_' . $tabUpper] = $tab;
+					$this->setLangContent($this->lang, $lang . '_' . $tabUpper, $tab);
 					// start field set
 					$this->configFieldSets[] = $this->_t(1) . "<fieldset";
 					$this->configFieldSets[] = $this->_t(2) . 'name="' . $tabCode . '"';
@@ -14298,9 +14259,9 @@ class Interpretation extends Fields
 			$this->configFieldSets[] = $this->_t(2) . 'label="' . $lang . '_GROUPS_LABEL"';
 			$this->configFieldSets[] = $this->_t(2) . 'description="' . $lang . '_GROUPS_DESC">';
 			// setup lang
-			$this->langContent[$this->lang][$lang . '_GROUPS_LABEL'] = "Target Groups";
-			$this->langContent[$this->lang][$lang . '_GROUPS_DESC'] = "The Parameters for the targeted groups are set here.";
-			$this->langContent[$this->lang][$lang . '_TARGET_GROUP_DESC'] = "Set the group/s being targeted by this user type.";
+			$this->setLangContent($this->lang, $lang . '_GROUPS_LABEL', "Target Groups");
+			$this->setLangContent($this->lang, $lang . '_GROUPS_DESC', "The Parameters for the targeted groups are set here.");
+			$this->setLangContent($this->lang, $lang . '_TARGET_GROUP_DESC', "Set the group/s being targeted by this user type.");
 
 			foreach ($this->setGroupControl as $selector => $label)
 			{
@@ -14342,8 +14303,8 @@ class Interpretation extends Fields
 		$this->configFieldSets[] = $this->_t(2) . 'label="' . $lang . '_GLOBAL_LABEL"';
 		$this->configFieldSets[] = $this->_t(2) . 'description="' . $lang . '_GLOBAL_DESC">';
 		// setup lang
-		$this->langContent[$this->lang][$lang . '_GLOBAL_LABEL'] = "Global";
-		$this->langContent[$this->lang][$lang . '_GLOBAL_DESC'] = "The Global Parameters";
+		$this->setLangContent($this->lang, $lang . '_GLOBAL_LABEL', "Global");
+		$this->setLangContent($this->lang, $lang . '_GLOBAL_DESC', "The Global Parameters");
 		// add auto checin if required
 		if ($this->addCheckin)
 		{
@@ -14368,14 +14329,14 @@ class Interpretation extends Fields
 			$this->configFieldSets[] = $this->_t(2) . "</field>";
 			$this->configFieldSets[] = $this->_t(2) . '<field type="spacer" name="spacerAuthor" hr="true" />';
 			// setup lang
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_LABEL'] = "Check in timer";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_DESC'] = "Set the intervals for the auto checkin fuction of tables that checks out the items to an user.";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_ONE'] = "Every five hours";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_TWO'] = "Every twelve hours";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_THREE'] = "Once a day";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_FOUR'] = "Every second day";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_FIVE'] = "Once a week";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_SIX'] = "Never";
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_LABEL', "Check in timer");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_DESC', "Set the intervals for the auto checkin fuction of tables that checks out the items to an user.");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_ONE', "Every five hours");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_TWO', "Every twelve hours");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_THREE', "Once a day");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_FOUR', "Every second day");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_FIVE', "Once a week");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_SIX', "Never");
 			// load the Global checkin defautls
 			$this->extensionsParams[] = '"check_in":"-1 day"';
 		}
@@ -14435,11 +14396,11 @@ class Interpretation extends Fields
 		$this->configFieldSets[] = $this->_t(3) . 'class="readonly"';
 		$this->configFieldSets[] = $this->_t(2) . "/>";
 		// setup lang
-		$this->langContent[$this->lang][$lang . '_AUTHOR'] = "Author Info";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_NAME_LABEL'] = "Author Name";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_NAME_DESC'] = "The name of the author of this component.";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_EMAIL_LABEL'] = "Author Email";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_EMAIL_DESC'] = "The email address of the author of this component.";
+		$this->setLangContent($this->lang, $lang . '_AUTHOR', "Author Info");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_NAME_LABEL', "Author Name");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_NAME_DESC', "The name of the author of this component.");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_EMAIL_LABEL', "Author Email");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_EMAIL_DESC', "The email address of the author of this component.");
 		// set if contributors were added
 		$langCont = $lang . '_CONTRIBUTOR';
 		if (isset($this->addContributors) && $this->addContributors && isset($this->componentData->contributors) && ComponentbuilderHelper::checkArray($this->componentData->contributors))
@@ -14513,7 +14474,7 @@ class Interpretation extends Fields
 				$this->theContributors .= PHP_EOL . $this->_t(1) . "@" . strtolower($contributor['title']) . $this->_t(2) . $contributor['name'] . ' <' . $contributor['website'] . '>';
 				// setup lang
 				$Counter = ComponentbuilderHelper::safeString($counter, 'Ww');
-				$this->langContent[$this->lang][$langCont . '_' . $COUNTER] = "Contributor " . $Counter;
+				$this->setLangContent($this->lang, $langCont . '_' . $COUNTER, "Contributor " . $Counter);
 				// load the Global checkin defautls
 				$this->extensionsParams[] = '"titleContributor' . $counter . '":"' . $cbTitle . '"';
 				$this->extensionsParams[] = '"nameContributor' . $counter . '":"' . $cbName . '"';
@@ -14596,31 +14557,31 @@ class Interpretation extends Fields
 				$this->configFieldSets[] = $this->_t(2) . "</field>";
 				// setup lang
 				$Counter = ComponentbuilderHelper::safeString($counter, 'Ww');
-				$this->langContent[$this->lang][$langCont . '_' . $COUNTER] = "Contributor " . $Counter;
+				$this->setLangContent($this->lang, $langCont . '_' . $COUNTER, "Contributor " . $Counter);
 			}
 		}
 		if ($this->addContributors || $this->componentData->emptycontributors == 1)
 		{
 			// setup lang
-			$this->langContent[$this->lang][$langCont . '_TITLE_LABEL'] = "Contributor Job Title";
-			$this->langContent[$this->lang][$langCont . '_TITLE_DESC'] = "The job title that best describes the contributor's relationship to this component.";
-			$this->langContent[$this->lang][$langCont . '_NAME_LABEL'] = "Contributor Name";
-			$this->langContent[$this->lang][$langCont . '_NAME_DESC'] = "The name of this contributor.";
-			$this->langContent[$this->lang][$langCont . '_EMAIL_LABEL'] = "Contributor Email";
-			$this->langContent[$this->lang][$langCont . '_EMAIL_DESC'] = "The email of this contributor.";
-			$this->langContent[$this->lang][$langCont . '_LINK_LABEL'] = "Contributor Website";
-			$this->langContent[$this->lang][$langCont . '_LINK_DESC'] = "The link to this contributor's website.";
-			$this->langContent[$this->lang][$langCont . '_USE_LABEL'] = "Use";
-			$this->langContent[$this->lang][$langCont . '_USE_DESC'] = "How should we link to this contributor.";
-			$this->langContent[$this->lang][$langCont . '_USE_NONE'] = "None";
-			$this->langContent[$this->lang][$langCont . '_USE_EMAIL'] = "Email";
-			$this->langContent[$this->lang][$langCont . '_USE_WWW'] = "Website";
-			$this->langContent[$this->lang][$langCont . '_SHOW_LABEL'] = "Show";
-			$this->langContent[$this->lang][$langCont . '_SHOW_DESC'] = "Select where you want this contributor's details to show in the component.";
-			$this->langContent[$this->lang][$langCont . '_SHOW_NONE'] = "Hide";
-			$this->langContent[$this->lang][$langCont . '_SHOW_BACK'] = "Back-end";
-			$this->langContent[$this->lang][$langCont . '_SHOW_FRONT'] = "Front-end";
-			$this->langContent[$this->lang][$langCont . '_SHOW_ALL'] = "Both Front & Back-end";
+			$this->setLangContent($this->lang, $langCont . '_TITLE_LABEL', "Contributor Job Title");
+			$this->setLangContent($this->lang, $langCont . '_TITLE_DESC', "The job title that best describes the contributor's relationship to this component.");
+			$this->setLangContent($this->lang, $langCont . '_NAME_LABEL', "Contributor Name");
+			$this->setLangContent($this->lang, $langCont . '_NAME_DESC', "The name of this contributor.");
+			$this->setLangContent($this->lang, $langCont . '_EMAIL_LABEL', "Contributor Email");
+			$this->setLangContent($this->lang, $langCont . '_EMAIL_DESC', "The email of this contributor.");
+			$this->setLangContent($this->lang, $langCont . '_LINK_LABEL', "Contributor Website");
+			$this->setLangContent($this->lang, $langCont . '_LINK_DESC', "The link to this contributor's website.");
+			$this->setLangContent($this->lang, $langCont . '_USE_LABEL', "Use");
+			$this->setLangContent($this->lang, $langCont . '_USE_DESC', "How should we link to this contributor.");
+			$this->setLangContent($this->lang, $langCont . '_USE_NONE', "None");
+			$this->setLangContent($this->lang, $langCont . '_USE_EMAIL', "Email");
+			$this->setLangContent($this->lang, $langCont . '_USE_WWW', "Website");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_LABEL', "Show");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_DESC', "Select where you want this contributor's details to show in the component.");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_NONE', "Hide");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_BACK', "Back-end");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_FRONT', "Front-end");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_ALL', "Both Front & Back-end");
 		}
 		// close that fieldset
 		$this->configFieldSets[] = $this->_t(1) . "</fieldset>";
@@ -14640,31 +14601,31 @@ class Interpretation extends Fields
 			// set tab lang
 			if (1 == $this->uikit)
 			{
-				$this->langContent[$this->lang][$lang . '_UIKIT_LABEL'] = "Uikit2 Settings";
-				$this->langContent[$this->lang][$lang . '_UIKIT_DESC'] = "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">https://getuikit.com/v2/</a>";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_LABEL', "Uikit2 Settings");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_DESC', "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">https://getuikit.com/v2/</a>");
 			}
 			elseif (2 == $this->uikit)
 			{
-				$this->langContent[$this->lang][$lang . '_UIKIT_LABEL'] = "Uikit2 and Uikit3 Settings";
-				$this->langContent[$this->lang][$lang . '_UIKIT_DESC'] = "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">version 2</a> or <a href=\"https://getuikit.com/\" target=\"_blank\">version 3</a>";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_LABEL', "Uikit2 and Uikit3 Settings");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_DESC', "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">version 2</a> or <a href=\"https://getuikit.com/\" target=\"_blank\">version 3</a>");
 			}
 			elseif (3 == $this->uikit)
 			{
-				$this->langContent[$this->lang][$lang . '_UIKIT_LABEL'] = "Uikit3 Settings";
-				$this->langContent[$this->lang][$lang . '_UIKIT_DESC'] = "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/\" target=\"_blank\">https://getuikit.com/</a>";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_LABEL', "Uikit3 Settings");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_DESC', "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/\" target=\"_blank\">https://getuikit.com/</a>");
 			}
 
 			// add version selection
 			if (2 == $this->uikit)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_UIKIT_VERSION_LABEL'] = "Uikit Versions";
-				$this->langContent[$this->lang][$lang . '_UIKIT_VERSION_DESC'] = "Select what version you would like to use";
-				$this->langContent[$this->lang][$lang . '_UIKIT_V2'] = "Version 2";
-				$this->langContent[$this->lang][$lang . '_UIKIT_V3'] = "Version 3";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_VERSION_LABEL', "Uikit Versions");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_VERSION_DESC', "Select what version you would like to use");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_V2', "Version 2");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_V3', "Version 3");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_version"';
 				$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14683,12 +14644,12 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			}
 
 			// set field lang
-			$this->langContent[$this->lang][$lang . '_UIKIT_LOAD_LABEL'] = "Loading Options";
-			$this->langContent[$this->lang][$lang . '_UIKIT_LOAD_DESC'] = "Set the uikit loading option.";
-			$this->langContent[$this->lang][$lang . '_AUTO_LOAD'] = "Auto";
-			$this->langContent[$this->lang][$lang . '_FORCE_LOAD'] = "Force";
-			$this->langContent[$this->lang][$lang . '_DONT_LOAD'] = "Not";
-			$this->langContent[$this->lang][$lang . '_ONLY_EXTRA'] = "Only Extra";
+			$this->setLangContent($this->lang, $lang . '_UIKIT_LOAD_LABEL', "Loading Options");
+			$this->setLangContent($this->lang, $lang . '_UIKIT_LOAD_DESC', "Set the uikit loading option.");
+			$this->setLangContent($this->lang, $lang . '_AUTO_LOAD', "Auto");
+			$this->setLangContent($this->lang, $lang . '_FORCE_LOAD', "Force");
+			$this->setLangContent($this->lang, $lang . '_DONT_LOAD', "Not");
+			$this->setLangContent($this->lang, $lang . '_ONLY_EXTRA', "Only Extra");
 			// set the field
 			$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_load"';
 			$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14713,10 +14674,10 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			$this->extensionsParams[] = '"uikit_load":"1"';
 
 			// set field lang
-			$this->langContent[$this->lang][$lang . '_UIKIT_MIN_LABEL'] = "Load Minified";
-			$this->langContent[$this->lang][$lang . '_UIKIT_MIN_DESC'] = "Should the minified version of uikit files be loaded?";
-			$this->langContent[$this->lang][$lang . '_YES'] = "Yes";
-			$this->langContent[$this->lang][$lang . '_NO'] = "No";
+			$this->setLangContent($this->lang, $lang . '_UIKIT_MIN_LABEL', "Load Minified");
+			$this->setLangContent($this->lang, $lang . '_UIKIT_MIN_DESC', "Should the minified version of uikit files be loaded?");
+			$this->setLangContent($this->lang, $lang . '_YES', "Yes");
+			$this->setLangContent($this->lang, $lang . '_NO', "No");
 			// set the field
 			$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_min"';
 			$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14736,11 +14697,11 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			if (2 == $this->uikit || 1 == $this->uikit)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_UIKIT_STYLE_LABEL'] = "css Style";
-				$this->langContent[$this->lang][$lang . '_UIKIT_STYLE_DESC'] = "Set the css style that should be used.";
-				$this->langContent[$this->lang][$lang . '_FLAT_LOAD'] = "Flat";
-				$this->langContent[$this->lang][$lang . '_ALMOST_FLAT_LOAD'] = "Almost Flat";
-				$this->langContent[$this->lang][$lang . '_GRADIANT_LOAD'] = "Gradient";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_STYLE_LABEL', "css Style");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_STYLE_DESC', "Set the css style that should be used.");
+				$this->setLangContent($this->lang, $lang . '_FLAT_LOAD', "Flat");
+				$this->setLangContent($this->lang, $lang . '_ALMOST_FLAT_LOAD', "Almost Flat");
+				$this->setLangContent($this->lang, $lang . '_GRADIANT_LOAD', "Gradient");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_style"';
 				$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14781,8 +14742,8 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			// main lang prefix
 			$lang = $lang . '';
 			// set main lang string
-			$this->langContent[$this->lang][$lang . '_MAIL_CONFIGURATION'] = "Mail Configuration";
-			$this->langContent[$this->lang][$lang . '_DKIM'] = "DKIM";
+			$this->setLangContent($this->lang, $lang . '_MAIL_CONFIGURATION', "Mail Configuration");
+			$this->setLangContent($this->lang, $lang . '_DKIM', "DKIM");
 			// start building field set for email helper functions
 			$this->configFieldSets[] = PHP_EOL . $this->_t(1) . "<fieldset";
 			$this->configFieldSets[] = $this->_t(2) . "name=\"mail_configuration_custom_config\"";
@@ -14796,51 +14757,51 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			else
 			{
 				// set all the laguage strings
-				$this->langContent[$this->lang][$lang . '_MAILONLINE_LABEL'] = "Mailer Status";
-				$this->langContent[$this->lang][$lang . '_MAILONLINE_DESCRIPTION'] = "Warning this will stop all emails from going out.";
-				$this->langContent[$this->lang][$lang . '_ON'] = "On";
-				$this->langContent[$this->lang][$lang . '_OFF'] = "Off";
-				$this->langContent[$this->lang][$lang . '_MAILER_LABEL'] = "Mailer";
-				$this->langContent[$this->lang][$lang . '_MAILER_DESCRIPTION'] = "Select what mailer you would like to use to send emails.";
-				$this->langContent[$this->lang][$lang . '_GLOBAL'] = "Global";
-				$this->langContent[$this->lang][$lang . '_PHP_MAIL'] = "PHP Mail";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL'] = "Sendmail";
-				$this->langContent[$this->lang][$lang . '_SMTP'] = "SMTP";
-				$this->langContent[$this->lang][$lang . '_EMAILFROM_LABEL'] = " From Email";
-				$this->langContent[$this->lang][$lang . '_EMAILFROM_DESCRIPTION'] = "The global email address that will be used to send system email.";
-				$this->langContent[$this->lang][$lang . '_EMAILFROM_HINT'] = "Email Address Here";
-				$this->langContent[$this->lang][$lang . '_FROMNAME_LABEL'] = "From Name";
-				$this->langContent[$this->lang][$lang . '_FROMNAME_DESCRIPTION'] = "Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name.";
-				$this->langContent[$this->lang][$lang . '_FROMNAME_HINT'] = "From Name Here";
-				$this->langContent[$this->lang][$lang . '_EMAILREPLY_LABEL'] = " Reply to Email";
-				$this->langContent[$this->lang][$lang . '_EMAILREPLY_DESCRIPTION'] = "The global email address that will be used to set as the reply email. (leave blank for none)";
-				$this->langContent[$this->lang][$lang . '_EMAILREPLY_HINT'] = "Email Address Here";
-				$this->langContent[$this->lang][$lang . '_REPLYNAME_LABEL'] = "Reply to Name";
-				$this->langContent[$this->lang][$lang . '_REPLYNAME_DESCRIPTION'] = "Text displayed in the header &quot;Reply To:&quot; field when replying to the site email. Usually the the person that receives the response. (leave blank for none)";
-				$this->langContent[$this->lang][$lang . '_REPLYNAME_HINT'] = "Reply Name Here";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL_LABEL'] = "Sendmail Path";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL_DESCRIPTION'] = "Enter the path to the sendmail program directory on your host server.";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL_HINT'] = "/usr/sbin/sendmail";
-				$this->langContent[$this->lang][$lang . '_SMTPAUTH_LABEL'] = "SMTP Authentication";
-				$this->langContent[$this->lang][$lang . '_SMTPAUTH_DESCRIPTION'] = "Select yes if your SMTP host requires SMTP Authentication.";
-				$this->langContent[$this->lang][$lang . '_YES'] = "Yes";
-				$this->langContent[$this->lang][$lang . '_NO'] = "No";
-				$this->langContent[$this->lang][$lang . '_SMTPSECURE_LABEL'] = "SMTP Security";
-				$this->langContent[$this->lang][$lang . '_SMTPSECURE_DESCRIPTION'] = "Select the security model that your SMTP server uses.";
-				$this->langContent[$this->lang][$lang . '_NONE'] = "None";
-				$this->langContent[$this->lang][$lang . '_SSL'] = "SSL";
-				$this->langContent[$this->lang][$lang . '_TLS'] = "TLS";
-				$this->langContent[$this->lang][$lang . '_SMTPPORT_LABEL'] = "SMTP Port";
-				$this->langContent[$this->lang][$lang . '_SMTPPORT_DESCRIPTION'] = "Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers.";
-				$this->langContent[$this->lang][$lang . '_SMTPPORT_HINT'] = "25";
-				$this->langContent[$this->lang][$lang . '_SMTPUSER_LABEL'] = "SMTP Username";
-				$this->langContent[$this->lang][$lang . '_SMTPUSER_DESCRIPTION'] = "Enter the username for access to the SMTP host.";
-				$this->langContent[$this->lang][$lang . '_SMTPUSER_HINT'] = "email@demo.com";
-				$this->langContent[$this->lang][$lang . '_SMTPPASS_LABEL'] = "SMTP Password";
-				$this->langContent[$this->lang][$lang . '_SMTPPASS_DESCRIPTION'] = "Enter the password for access to the SMTP host.";
-				$this->langContent[$this->lang][$lang . '_SMTPHOST_LABEL'] = "SMTP Host";
-				$this->langContent[$this->lang][$lang . '_SMTPHOST_DESCRIPTION'] = "Enter the name of the SMTP host.";
-				$this->langContent[$this->lang][$lang . '_SMTPHOST_HINT'] = "localhost";
+				$this->setLangContent($this->lang, $lang . '_MAILONLINE_LABEL', "Mailer Status");
+				$this->setLangContent($this->lang, $lang . '_MAILONLINE_DESCRIPTION', "Warning this will stop all emails from going out.");
+				$this->setLangContent($this->lang, $lang . '_ON', "On");
+				$this->setLangContent($this->lang, $lang . '_OFF', "Off");
+				$this->setLangContent($this->lang, $lang . '_MAILER_LABEL', "Mailer");
+				$this->setLangContent($this->lang, $lang . '_MAILER_DESCRIPTION', "Select what mailer you would like to use to send emails.");
+				$this->setLangContent($this->lang, $lang . '_GLOBAL', "Global");
+				$this->setLangContent($this->lang, $lang . '_PHP_MAIL', "PHP Mail");
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL', "Sendmail");
+				$this->setLangContent($this->lang, $lang . '_SMTP', "SMTP");
+				$this->setLangContent($this->lang, $lang . '_EMAILFROM_LABEL', " From Email");
+				$this->setLangContent($this->lang, $lang . '_EMAILFROM_DESCRIPTION', "The global email address that will be used to send system email.");
+				$this->setLangContent($this->lang, $lang . '_EMAILFROM_HINT', "Email Address Here");
+				$this->setLangContent($this->lang, $lang . '_FROMNAME_LABEL', "From Name");
+				$this->setLangContent($this->lang, $lang . '_FROMNAME_DESCRIPTION', "Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name."); 
+				$this->setLangContent($this->lang, $lang . '_FROMNAME_HINT', "From Name Here"); 
+				$this->setLangContent($this->lang, $lang . '_EMAILREPLY_LABEL', " Reply to Email"); 
+				$this->setLangContent($this->lang, $lang . '_EMAILREPLY_DESCRIPTION', "The global email address that will be used to set as the reply email. (leave blank for none)"); 
+				$this->setLangContent($this->lang, $lang . '_EMAILREPLY_HINT', "Email Address Here"); 
+				$this->setLangContent($this->lang, $lang . '_REPLYNAME_LABEL', "Reply to Name"); 
+				$this->setLangContent($this->lang, $lang . '_REPLYNAME_DESCRIPTION', "Text displayed in the header &quot;Reply To:&quot; field when replying to the site email. Usually the the person that receives the response. (leave blank for none)"); 
+				$this->setLangContent($this->lang, $lang . '_REPLYNAME_HINT', "Reply Name Here"); 
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL_LABEL', "Sendmail Path"); 
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL_DESCRIPTION', "Enter the path to the sendmail program directory on your host server."); 
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL_HINT', "/usr/sbin/sendmail"); 
+				$this->setLangContent($this->lang, $lang . '_SMTPAUTH_LABEL', "SMTP Authentication");
+				$this->setLangContent($this->lang, $lang . '_SMTPAUTH_DESCRIPTION', "Select yes if your SMTP host requires SMTP Authentication.");
+				$this->setLangContent($this->lang, $lang . '_YES', "Yes");
+				$this->setLangContent($this->lang, $lang . '_NO', "No");
+				$this->setLangContent($this->lang, $lang . '_SMTPSECURE_LABEL', "SMTP Security");
+				$this->setLangContent($this->lang, $lang . '_SMTPSECURE_DESCRIPTION', "Select the security model that your SMTP server uses.");
+				$this->setLangContent($this->lang, $lang . '_NONE', "None");
+				$this->setLangContent($this->lang, $lang . '_SSL', "SSL");
+				$this->setLangContent($this->lang, $lang . '_TLS', "TLS");
+				$this->setLangContent($this->lang, $lang . '_SMTPPORT_LABEL', "SMTP Port");
+				$this->setLangContent($this->lang, $lang . '_SMTPPORT_DESCRIPTION', "Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers.");
+				$this->setLangContent($this->lang, $lang . '_SMTPPORT_HINT', "25");
+				$this->setLangContent($this->lang, $lang . '_SMTPUSER_LABEL', "SMTP Username");
+				$this->setLangContent($this->lang, $lang . '_SMTPUSER_DESCRIPTION', "Enter the username for access to the SMTP host.");
+				$this->setLangContent($this->lang, $lang . '_SMTPUSER_HINT', "email@demo.com");
+				$this->setLangContent($this->lang, $lang . '_SMTPPASS_LABEL', "SMTP Password");
+				$this->setLangContent($this->lang, $lang . '_SMTPPASS_DESCRIPTION', "Enter the password for access to the SMTP host.");
+				$this->setLangContent($this->lang, $lang . '_SMTPHOST_LABEL', "SMTP Host");
+				$this->setLangContent($this->lang, $lang . '_SMTPHOST_DESCRIPTION', "Enter the name of the SMTP host.");
+				$this->setLangContent($this->lang, $lang . '_SMTPHOST_HINT', "localhost");
 
 				// set the mailer fields
 				$this->configFieldSets[] = PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Mailonline Field. Type: Radio. (joomla) -->";
@@ -15057,27 +15018,27 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_DKIM_LABEL'] = "Enable DKIM";
-				$this->langContent[$this->lang][$lang . '_DKIM_DESCRIPTION'] = "Set this option to Yes if you want to sign your emails using DKIM.";
-				$this->langContent[$this->lang][$lang . '_YES'] = "Yes";
-				$this->langContent[$this->lang][$lang . '_NO'] = "No";
-				$this->langContent[$this->lang][$lang . '_DKIM_DOMAIN_LABEL'] = "Domain";
-				$this->langContent[$this->lang][$lang . '_DKIM_DOMAIN_DESCRIPTION'] = "Set the domain. Eg. domain.com";
-				$this->langContent[$this->lang][$lang . '_DKIM_DOMAIN_HINT'] = "domain.com";
-				$this->langContent[$this->lang][$lang . '_DKIM_SELECTOR_LABEL'] = "Selector";
-				$this->langContent[$this->lang][$lang . '_DKIM_SELECTOR_DESCRIPTION'] = "Set your DKIM/DNS selector.";
-				$this->langContent[$this->lang][$lang . '_DKIM_SELECTOR_HINT'] = "vdm";
-				$this->langContent[$this->lang][$lang . '_DKIM_PASSPHRASE_LABEL'] = "Passphrase";
-				$this->langContent[$this->lang][$lang . '_DKIM_PASSPHRASE_DESCRIPTION'] = "Enter your passphrase here.";
-				$this->langContent[$this->lang][$lang . '_DKIM_IDENTITY_LABEL'] = "Identity";
-				$this->langContent[$this->lang][$lang . '_DKIM_IDENTITY_DESCRIPTION'] = "Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email.";
-				$this->langContent[$this->lang][$lang . '_DKIM_IDENTITY_HINT'] = "you@yourdomain.com";
-				$this->langContent[$this->lang][$lang . '_DKIM_PRIVATE_KEY_LABEL'] = "Private key";
-				$this->langContent[$this->lang][$lang . '_DKIM_PRIVATE_KEY_DESCRIPTION'] = "set private key";
-				$this->langContent[$this->lang][$lang . '_DKIM_PUBLIC_KEY_LABEL'] = "Public key";
-				$this->langContent[$this->lang][$lang . '_DKIM_PUBLIC_KEY_DESCRIPTION'] = "set public key";
-				$this->langContent[$this->lang][$lang . '_NOTE_DKIM_USE_LABEL'] = "Server Configuration";
-				$this->langContent[$this->lang][$lang . '_NOTE_DKIM_USE_DESCRIPTION'] = "<p>Using the below details, you need to configure your DNS by adding a TXT record on your domain: <b><span id='a_dkim_domain'></span></b></p>
+				$this->setLangContent($this->lang, $lang . '_DKIM_LABEL', "Enable DKIM");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DESCRIPTION', "Set this option to Yes if you want to sign your emails using DKIM.");
+				$this->setLangContent($this->lang, $lang . '_YES', "Yes");
+				$this->setLangContent($this->lang, $lang . '_NO', "No");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DOMAIN_LABEL', "Domain");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DOMAIN_DESCRIPTION', "Set the domain. Eg. domain.com");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DOMAIN_HINT', "domain.com");
+				$this->setLangContent($this->lang, $lang . '_DKIM_SELECTOR_LABEL', "Selector");
+				$this->setLangContent($this->lang, $lang . '_DKIM_SELECTOR_DESCRIPTION', "Set your DKIM/DNS selector.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_SELECTOR_HINT', "vdm");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PASSPHRASE_LABEL', "Passphrase");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PASSPHRASE_DESCRIPTION', "Enter your passphrase here.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_IDENTITY_LABEL', "Identity");
+				$this->setLangContent($this->lang, $lang . '_DKIM_IDENTITY_DESCRIPTION', "Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_IDENTITY_HINT', "you@yourdomain.com");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PRIVATE_KEY_LABEL', "Private key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PRIVATE_KEY_DESCRIPTION', "set private key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PUBLIC_KEY_LABEL', "Public key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PUBLIC_KEY_DESCRIPTION', "set public key");
+				$this->setLangContent($this->lang, $lang . '_NOTE_DKIM_USE_LABEL', "Server Configuration");
+				$this->setLangContent($this->lang, $lang . '_NOTE_DKIM_USE_DESCRIPTION', "<p>Using the below details, you need to configure your DNS by adding a TXT record on your domain: <b><span id='a_dkim_domain'></span></b></p>
 <script>
 jQuery(document).ready(function()
 {
@@ -15103,13 +15064,13 @@ function vdm_dkim() {
 	        jQuery('#jform_dkim_value').val('v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=' + jQuery('#jform_dkim_public_key').val());
         }
 }
-</script>";
-				$this->langContent[$this->lang][$lang . '_DKIM_KEY_LABEL'] = "Key";
-				$this->langContent[$this->lang][$lang . '_DKIM_KEY_DESCRIPTION'] = "This is the KEY to use in the DNS record.";
-				$this->langContent[$this->lang][$lang . '_DKIM_KEY_HINT'] = "vdm._domainkey";
-				$this->langContent[$this->lang][$lang . '_DKIM_VALUE_LABEL'] = "Value";
-				$this->langContent[$this->lang][$lang . '_DKIM_VALUE_DESCRIPTION'] = "This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key.";
-				$this->langContent[$this->lang][$lang . '_DKIM_VALUE_HINT'] = "v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY";
+</script>");
+				$this->setLangContent($this->lang, $lang . '_DKIM_KEY_LABEL', "Key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_KEY_DESCRIPTION', "This is the KEY to use in the DNS record.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_KEY_HINT', "vdm._domainkey");
+				$this->setLangContent($this->lang, $lang . '_DKIM_VALUE_LABEL', "Value");
+				$this->setLangContent($this->lang, $lang . '_DKIM_VALUE_DESCRIPTION', "This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_VALUE_HINT', "v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY");
 
 
 				$this->configFieldSets[] = PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Dkim Field. Type: Radio. (joomla) -->";
@@ -15496,38 +15457,38 @@ function vdm_dkim() {
 			$this->extensionsParams[] = '"admin_chartbackground":"#F7F7FA","admin_mainwidth":"1000","admin_chartareatop":"20","admin_chartarealeft":"20","admin_chartareawidth":"170","admin_legendtextstylefontcolor":"10","admin_legendtextstylefontsize":"20","admin_vaxistextstylefontcolor":"#63B1F2","admin_haxistextstylefontcolor":"#63B1F2","admin_haxistitletextstylefontcolor":"#63B1F2","site_chartbackground":"#F7F7FA","site_mainwidth":"1000","site_chartareatop":"20","site_chartarealeft":"20","site_chartareawidth":"170","site_legendtextstylefontcolor":"10","site_legendtextstylefontsize":"20","site_vaxistextstylefontcolor":"#63B1F2","site_haxistextstylefontcolor":"#63B1F2","site_haxistitletextstylefontcolor":"#63B1F2"';
 
 			// set field lang
-			$this->langContent[$this->lang][$lang . '_CHART_SETTINGS_LABEL'] = "Chart Settings";
-			$this->langContent[$this->lang][$lang . '_CHART_SETTINGS_DESC'] = "The Google Chart Display Settings Are Made Here.";
-			$this->langContent[$this->lang][$lang . '_ADMIN_CHART_NOTE_LABEL'] = "Admin Settings";
-			$this->langContent[$this->lang][$lang . '_ADMIN_CHART_NOTE_DESC'] = "The following settings are used on the back-end of the site called (admin).";
-			$this->langContent[$this->lang][$lang . '_SITE_CHART_NOTE_LABEL'] = "Site Settings";
-			$this->langContent[$this->lang][$lang . '_SITE_CHART_NOTE_DESC'] = "The following settings are used on the front-end of the site called (site).";
+			$this->setLangContent($this->lang, $lang . '_CHART_SETTINGS_LABEL', "Chart Settings");
+			$this->setLangContent($this->lang, $lang . '_CHART_SETTINGS_DESC', "The Google Chart Display Settings Are Made Here.");
+			$this->setLangContent($this->lang, $lang . '_ADMIN_CHART_NOTE_LABEL', "Admin Settings");
+			$this->setLangContent($this->lang, $lang . '_ADMIN_CHART_NOTE_DESC', "The following settings are used on the back-end of the site called (admin).");
+			$this->setLangContent($this->lang, $lang . '_SITE_CHART_NOTE_LABEL', "Site Settings");
+			$this->setLangContent($this->lang, $lang . '_SITE_CHART_NOTE_DESC', "The following settings are used on the front-end of the site called (site).");
 
-			$this->langContent[$this->lang][$lang . '_CHARTAREALEFT_DESC'] = "Set in pixels the spacing from the left of the chart area to the beginning of the chart it self. Please don't add the px sign";
-			$this->langContent[$this->lang][$lang . '_CHARTAREALEFT_HINT'] = "170";
-			$this->langContent[$this->lang][$lang . '_CHARTAREALEFT_LABEL'] = "Left Spacing";
-			$this->langContent[$this->lang][$lang . '_CHARTAREATOP_DESC'] = "Set in pixels the spacing from the top of the chart area to the beginning of the chart it self. Please don't add the px sign";
-			$this->langContent[$this->lang][$lang . '_CHARTAREATOP_HINT'] = "20";
-			$this->langContent[$this->lang][$lang . '_CHARTAREATOP_LABEL'] = "Top Spacing";
-			$this->langContent[$this->lang][$lang . '_CHARTAREAWIDTH_DESC'] = "Set in % the width of the chart it self inside the chart area. Please don't add the % sign";
-			$this->langContent[$this->lang][$lang . '_CHARTAREAWIDTH_HINT'] = "60";
-			$this->langContent[$this->lang][$lang . '_CHARTAREAWIDTH_LABEL'] = "Chart Width";
-			$this->langContent[$this->lang][$lang . '_CHARTBACKGROUND_DESC'] = "Select the chart background color here.";
-			$this->langContent[$this->lang][$lang . '_CHARTBACKGROUND_LABEL'] = "Chart Background";
-			$this->langContent[$this->lang][$lang . '_HAXISTEXTSTYLEFONTCOLOR_DESC'] = "Select the horizontal axis font color.";
-			$this->langContent[$this->lang][$lang . '_HAXISTEXTSTYLEFONTCOLOR_LABEL'] = "hAxis Font Color";
-			$this->langContent[$this->lang][$lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_DESC'] = "Select the horizontal axis title's font color.";
-			$this->langContent[$this->lang][$lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL'] = "hAxis Title Font Color";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTCOLOR_DESC'] = "Select the legend font color.";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTCOLOR_LABEL'] = "Legend Font Color";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTSIZE_DESC'] = "Set in pixels the font size of the legend";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTSIZE_HINT'] = "10";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTSIZE_LABEL'] = "Legend Font Size";
-			$this->langContent[$this->lang][$lang . '_MAINWIDTH_DESC'] = "Set the width of the entire chart area";
-			$this->langContent[$this->lang][$lang . '_MAINWIDTH_HINT'] = "1000";
-			$this->langContent[$this->lang][$lang . '_MAINWIDTH_LABEL'] = "Chart Area Width";
-			$this->langContent[$this->lang][$lang . '_VAXISTEXTSTYLEFONTCOLOR_DESC'] = "Select the vertical axis font color.";
-			$this->langContent[$this->lang][$lang . '_VAXISTEXTSTYLEFONTCOLOR_LABEL'] = "vAxis Font Color";
+			$this->setLangContent($this->lang, $lang . '_CHARTAREALEFT_DESC', "Set in pixels the spacing from the left of the chart area to the beginning of the chart it self. Please don't add the px sign");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREALEFT_HINT', "170");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREALEFT_LABEL', "Left Spacing");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREATOP_DESC', "Set in pixels the spacing from the top of the chart area to the beginning of the chart it self. Please don't add the px sign");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREATOP_HINT', "20");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREATOP_LABEL', "Top Spacing");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREAWIDTH_DESC', "Set in % the width of the chart it self inside the chart area. Please don't add the % sign");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREAWIDTH_HINT', "60");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREAWIDTH_LABEL', "Chart Width");
+			$this->setLangContent($this->lang, $lang . '_CHARTBACKGROUND_DESC', "Select the chart background color here.");
+			$this->setLangContent($this->lang, $lang . '_CHARTBACKGROUND_LABEL', "Chart Background");
+			$this->setLangContent($this->lang, $lang . '_HAXISTEXTSTYLEFONTCOLOR_DESC', "Select the horizontal axis font color.");
+			$this->setLangContent($this->lang, $lang . '_HAXISTEXTSTYLEFONTCOLOR_LABEL', "hAxis Font Color");
+			$this->setLangContent($this->lang, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_DESC', "Select the horizontal axis title's font color.");
+			$this->setLangContent($this->lang, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL', "hAxis Title Font Color");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_DESC', "Select the legend font color.");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_LABEL', "Legend Font Color");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_DESC', "Set in pixels the font size of the legend");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_HINT', "10");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_LABEL', "Legend Font Size");
+			$this->setLangContent($this->lang, $lang . '_MAINWIDTH_DESC', "Set the width of the entire chart area");
+			$this->setLangContent($this->lang, $lang . '_MAINWIDTH_HINT', "1000");
+			$this->setLangContent($this->lang, $lang . '_MAINWIDTH_LABEL', "Chart Area Width");
+			$this->setLangContent($this->lang, $lang . '_VAXISTEXTSTYLEFONTCOLOR_DESC', "Select the vertical axis font color.");
+			$this->setLangContent($this->lang, $lang . '_VAXISTEXTSTYLEFONTCOLOR_LABEL', "vAxis Font Color");
 		}
 	}
 
@@ -15558,8 +15519,8 @@ function vdm_dkim() {
 				(isset($this->whmcsEncryption) && $this->whmcsEncryption)) &&
 				$this->componentData->add_license && $this->componentData->license_type == 3)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "License & Encryption Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The license & encryption keys are set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "License & Encryption Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The license & encryption keys are set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "License & Encryption Settings";
 			}
@@ -15568,38 +15529,38 @@ function vdm_dkim() {
 				(isset($this->whmcsEncryption) && $this->whmcsEncryption)) &&
 				$this->componentData->add_license && $this->componentData->license_type == 2)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "Update & Encryption Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The update & encryption keys are set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "Update & Encryption Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The update & encryption keys are set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "Update & Encryption Settings";
 			}
 			elseif ($this->componentData->add_license && $this->componentData->license_type == 3)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "License Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The license key is set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL',  "License Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC',  "The license key is set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "License Settings";
 			}
 			elseif ($this->componentData->add_license && $this->componentData->license_type == 2)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "Update Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The update key is set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "Update Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The update key is set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "Update Settings";
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "Encryption Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The encryption key for the field encryption is set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "Encryption Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The encryption key for the field encryption is set here.");
 			}
 
 			if (isset($this->basicEncryption) && $this->basicEncryption)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_LABEL'] = "Basic Key";
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_DESC'] = "Set the basic local key here.";
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_NOTE_LABEL'] = "Basic Encryption";
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_NOTE_DESC'] = "When using the basic encryption please use set a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_LABEL', "Basic Key");
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_DESC', "Set the basic local key here.");
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_NOTE_LABEL', "Basic Encryption");
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_NOTE_DESC', "When using the basic encryption please use set a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="basic_key_note" class="alert alert-info" label="' . $lang . '_BASIC_KEY_NOTE_LABEL" description="' . $lang . '_BASIC_KEY_NOTE_DESC"  />';
 				$this->configFieldSets[] = $this->_t(2) . '<field name="basic_key"';
@@ -15613,10 +15574,10 @@ function vdm_dkim() {
 			if (isset($this->mediumEncryption) && $this->mediumEncryption)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_LABEL'] = "Medium Key (Path)";
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_DESC'] = "Set the full path to where the key file must be stored. Make sure it is behind the root folder of your website, so that it is not public accessible.";
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_NOTE_LABEL'] = "Medium Encryption";
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_NOTE_DESC'] = "When using the medium encryption option, the system generates its own key and stores it in a file at the folder/path you set here.<br />Never change this key once it is set, or remove the key file! <b>DATA WILL GET CORRUPTED IF YOU DO!</b> Also make sure the full path to where the the key file should be stored, is behind the root folder of your website/system, so that it is not public accessible. Making a backup of this key file over a <b>secure connection</b> is recommended!";
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_LABEL', "Medium Key (Path)");
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_DESC', "Set the full path to where the key file must be stored. Make sure it is behind the root folder of your website, so that it is not public accessible.");
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_NOTE_LABEL', "Medium Encryption");
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_NOTE_DESC', "When using the medium encryption option, the system generates its own key and stores it in a file at the folder/path you set here.<br />Never change this key once it is set, or remove the key file! <b>DATA WILL GET CORRUPTED IF YOU DO!</b> Also make sure the full path to where the the key file should be stored, is behind the root folder of your website/system, so that it is not public accessible. Making a backup of this key file over a <b>secure connection</b> is recommended!");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="medium_key_note" class="alert alert-info" label="' . $lang . '_MEDIUM_KEY_NOTE_LABEL" description="' . $lang . '_MEDIUM_KEY_NOTE_DESC" />';
 				$this->configFieldSets[] = $this->_t(2) . '<field name="medium_key_path"';
@@ -15629,54 +15590,54 @@ function vdm_dkim() {
 				$this->configFieldSets[] = $this->_t(3) . 'default=""';
 				$this->configFieldSets[] = $this->_t(2) . "/>";
 				// set some error message if the path does not exist
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_PATH_ERROR'] = "Medium key path (for encryption of various fields) does not exist, or is not writable. Please check the path and update it in the global option of this component.";
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_PATH_ERROR', "Medium key path (for encryption of various fields) does not exist, or is not writable. Please check the path and update it in the global option of this component.");
 			}
 			if (isset($this->whmcsEncryption) && $this->whmcsEncryption || $this->componentData->add_license)
 			{
 				// set field lang label and description
 				if ($this->componentData->add_license && $this->componentData->license_type == 3)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " License Key";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the license key you recieved from " . $this->componentData->companyname . " here.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_LABEL', $this->componentData->companyname . " License Key");
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_DESC', "Add the license key you recieved from " . $this->componentData->companyname . " here.");
 				}
 				elseif ($this->componentData->add_license && $this->componentData->license_type == 2)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Update Key";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the update key you recieved from " . $this->componentData->companyname . " here.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_LABEL', $this->componentData->companyname . " Update Key");
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_DESC', "Add the update key you recieved from " . $this->componentData->companyname . " here.");
 				}
 				else
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Key";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the key you recieved from " . $this->componentData->companyname . " here.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_LABEL', $this->componentData->companyname . " Key");
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_DESC', "Add the key you recieved from " . $this->componentData->companyname . " here.");
 				}
 				// ajust the notice based on license
 				if ($this->componentData->license_type == 3)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " License Key";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " License Key");
 				}
 				elseif ($this->componentData->license_type == 2)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Update Key";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " Update Key");
 				}
 				else
 				{
 					if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
 					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Field Encryption Key";
+						$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " Field Encryption Key");
 					}
 					else
 					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Key";
+						$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " Key");
 					}
 				}
 				// add the description based on global settings
 				if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.<br />When using the " . $this->componentData->companyname . " field encryption you can never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_DESC', "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.<br />When using the " . $this->componentData->companyname . " field encryption you can never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>");
 				}
 				else
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_DESC', "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.");
 				}
 				// set the fields
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="whmcs_key_note" class="alert alert-info" label="' . $lang . '_WHMCS_KEY_NOTE_LABEL" description="' . $lang . '_WHMCS_KEY_NOTE_DESC"  />';
@@ -15760,27 +15721,27 @@ function vdm_dkim() {
 		{
 			$exportTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Export Data', 'U');
 			$exportDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Export Data', 'U') . '_DESC';
-			$this->langContent['bothadmin'][$exportTitle] = 'Export Data';
-			$this->langContent['bothadmin'][$exportDesc] = ' Allows users in this group to export data.';
+			$this->setLangContent('bothadmin', $exportTitle, 'Export Data');
+			$this->setLangContent('bothadmin', $exportDesc, ' Allows users in this group to export data.');
 			$this->componentHead[] = $this->_t(2) . '<action name="core.export" title="' . $exportTitle . '" description="' . $exportDesc . '" />';
 
 			$importTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U');
 			$importDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U') . '_DESC';
-			$this->langContent['bothadmin'][$importTitle] = 'Import Data';
-			$this->langContent['bothadmin'][$importDesc] = ' Allows users in this group to import data.';
+			$this->setLangContent('bothadmin', $importTitle, 'Import Data');
+			$this->setLangContent('bothadmin', $importDesc, ' Allows users in this group to import data.');
 			$this->componentHead[] = $this->_t(2) . '<action name="core.import" title="' . $importTitle . '" description="' . $importDesc . '" />';
 		}
 		// version permission
 		$batchTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Use Batch', 'U');
 		$batchDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Use Batch', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$batchTitle] = 'Use Batch';
-		$this->langContent['bothadmin'][$batchDesc] = ' Allows users in this group to use batch copy/update method.';
+		$this->setLangContent('bothadmin', $batchTitle, 'Use Batch');
+		$this->setLangContent('bothadmin', $batchDesc, ' Allows users in this group to use batch copy/update method.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.batch" title="' . $batchTitle . '" description="' . $batchDesc . '" />';
 		// version permission
 		$importTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Versions', 'U');
 		$importDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Versions', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$importTitle] = 'Edit Version';
-		$this->langContent['bothadmin'][$importDesc] = ' Allows users in this group to edit versions.';
+		$this->setLangContent('bothadmin', $importTitle, 'Edit Version');
+		$this->setLangContent('bothadmin', $importDesc, ' Allows users in this group to edit versions.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.version" title="' . $importTitle . '" description="' . $importDesc . '" />';
 		// set the defaults
 		$this->componentHead[] = $this->_t(2) . '<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />';
@@ -15796,14 +15757,14 @@ function vdm_dkim() {
 		// new custom created by permissions
 		$created_byTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created By', 'U');
 		$created_byDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created By', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$created_byTitle] = 'Edit Created By';
-		$this->langContent['bothadmin'][$created_byDesc] = ' Allows users in this group to edit created by.';
+		$this->setLangContent('bothadmin', $created_byTitle, 'Edit Created By');
+		$this->setLangContent('bothadmin', $created_byDesc, ' Allows users in this group to edit created by.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.edit.created_by" title="' . $created_byTitle . '" description="' . $created_byDesc . '" />';
 		// new custom created date permissions
 		$createdTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created Date', 'U');
 		$createdDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created Date', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$createdTitle] = 'Edit Created Date';
-		$this->langContent['bothadmin'][$createdDesc] = ' Allows users in this group to edit created date.';
+		$this->setLangContent('bothadmin', $createdTitle, 'Edit Created Date');
+		$this->setLangContent('bothadmin', $createdDesc, ' Allows users in this group to edit created date.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.edit.created" title="' . $createdTitle . '" description="' . $createdDesc . '" />';
 
 		// set the menu controller lookup
@@ -15819,8 +15780,8 @@ function vdm_dkim() {
 				$customAdminTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($customAdminName . ' Access', 'U');
 				$customAdminDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($customAdminName . ' Access', 'U') . '_DESC';
 				$sortKey = ComponentbuilderHelper::safeString($customAdminName . ' Access');
-				$this->langContent['bothadmin'][$customAdminTitle] = $customAdminName . ' Access';
-				$this->langContent['bothadmin'][$customAdminDesc] = ' Allows the users in this group to access ' . ComponentbuilderHelper::safeString($customAdminName, 'w') . '.';
+				$this->setLangContent('bothadmin', $customAdminTitle, $customAdminName . ' Access');
+				$this->setLangContent('bothadmin', $customAdminDesc,  ' Allows the users in this group to access ' . ComponentbuilderHelper::safeString($customAdminName, 'w') . '.');
 				$this->componentGlobal[$sortKey] = $this->_t(2) . '<action name="' . $customAdminCode . '.access" title="' . $customAdminTitle . '" description="' . $customAdminDesc . '" />';
 				// add the custom permissions to use the buttons of this view
 				$this->addCustomButtonPermissions($custom_admin_view['settings'], $customAdminName, $customAdminCode);
@@ -15866,8 +15827,8 @@ function vdm_dkim() {
 				$sortKey = ComponentbuilderHelper::safeString($siteName . ' Access Site');
 				if (isset($site_view['access']) && $site_view['access'] == 1)
 				{
-					$this->langContent['bothadmin'][$siteTitle] = $siteName . ' (Site) Access';
-					$this->langContent['bothadmin'][$siteDesc] = ' Allows the users in this group to access site ' . ComponentbuilderHelper::safeString($siteName, 'w') . '.';
+					$this->setLangContent('bothadmin', $siteTitle, $siteName . ' (Site) Access');
+					$this->setLangContent('bothadmin', $siteDesc, ' Allows the users in this group to access site ' . ComponentbuilderHelper::safeString($siteName, 'w') . '.');
 					$this->componentGlobal[$sortKey] = $this->_t(2) . '<action name="site.' . $siteCode . '.access" title="' . $siteTitle . '" description="' . $siteDesc . '" />';
 
 					// check if this site view requires access rule to default to public
@@ -16030,8 +15991,8 @@ function vdm_dkim() {
 				$customButtonTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($nameView . ' ' . $customButtonName . ' Button Access', 'U');
 				$customButtonDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($nameView . ' ' . $customButtonName . ' Button Access', 'U') . '_DESC';
 				$sortButtonKey = ComponentbuilderHelper::safeString($nameView . ' ' . $customButtonName . ' Button Access');
-				$this->langContent['bothadmin'][$customButtonTitle] = $nameView . ' ' . $customButtonName . ' Button Access';
-				$this->langContent['bothadmin'][$customButtonDesc] = ' Allows the users in this group to access the ' . ComponentbuilderHelper::safeString($customButtonName, 'w') . ' button.';
+				$this->setLangContent('bothadmin', $customButtonTitle, $nameView . ' ' . $customButtonName . ' Button Access');
+				$this->setLangContent('bothadmin', $customButtonDesc, ' Allows the users in this group to access the ' . ComponentbuilderHelper::safeString($customButtonName, 'w') . ' button.');
 				$this->componentGlobal[$sortButtonKey] = $this->_t(2) . '<action name="' . $code . '.' . $customButtonCode . '" title="' . $customButtonTitle . '" description="' . $customButtonDesc . '" />';
 			}
 		}
@@ -16318,8 +16279,8 @@ function vdm_dkim() {
 					}
 				}
 				// set to language file
-				$this->langContent['bothadmin'][$title] = trim($permission['title']);
-				$this->langContent['bothadmin'][$title . '_DESC'] = trim($permission['description']);
+				$this->setLangContent('bothadmin', $title, $permission['title']);
+				$this->setLangContent('bothadmin', $title . '_DESC', $permission['description']);
 			}
 		}
 	}
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index d26981031..61e1c5041 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -628,14 +628,8 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'sviews' . $this->hhh] = $view['settings']->code;
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SVIEWS' . $this->hhh] = $view['settings']->CODE;
 					// add to lang array
-					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE]))
-					{
-						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE] = $view['settings']->name;
-					}
-					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
-					{
-						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-					}
+					$this->setLangContent($this->lang, $this->langPrefix . '_' . $view['settings']->CODE, $view['settings']->name);
+					$this->setLangContent($this->lang, $this->langPrefix . '_' . $view['settings']->CODE . '_DESC', $view['settings']->description);
 					// ICOMOON <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'ICOMOON' . $this->hhh] = $view['icomoon'];
 
@@ -929,14 +923,8 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_AFTER_GET_ITEMS' . $this->hhh] = $this->getCustomScriptBuilder($this->target . '_php_after_getitems', $view['settings']->code, PHP_EOL, null, true);
 					}
 					// add to lang array
-					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE]))
-					{
-						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE] = $view['settings']->name;
-					}
-					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
-					{
-						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-					}
+					$this->setLangContent('site', $this->langPrefix . '_' . $view['settings']->CODE, $view['settings']->name);
+					$this->setLangContent('site', $this->langPrefix . '_' . $view['settings']->CODE . '_DESC', $view['settings']->description);
 					// SITE_CUSTOM_METHODS <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_CUSTOM_METHODS' . $this->hhh] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_CUSTOM_METHODS' . $this->hhh] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 2fb2979ad..7ead4e459 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -132,19 +132,21 @@ abstract class ComponentbuilderHelper
 	/**
 	* Making field names safe
 	*
-	* @input	string   The you would like to make safe
+	* @input	string       The you would like to make safe
+	* @input	boolean      The switch to return an ALL UPPER CASE string
+	* @input	string       The string to use in white space
 	*
 	* @returns string on success
 	**/
-	public static function safeFieldName($string, $spacer = '_')
+	public static function safeFieldName($string, $allcap = false, $spacer = '_')
 	{
 		// get global value
 		if (self::$fieldNameBuilder === false)
 		{
-			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 0); // change this to 1 for testing the new convention
+			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 1);
 		}
 		// use the new convention
-		if (1 == self::$fieldNameBuilder)
+		if (2 == self::$fieldNameBuilder)
 		{
 			// 0nly continue if we have a string
 			if (self::checkString($string))
@@ -162,12 +164,22 @@ abstract class ComponentbuilderHelper
 				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
 				// replace white space with underscore (SAFEST OPTION)
 				$string = preg_replace('/\s+/', $spacer, $string);
+				// return all caps
+				if ($allcap)
+				{
+					return strtoupper($string);
+				}
 				// default is to return lower
 				return strtolower($string);
 			}
 			// not a string
 			return '';
 		}
+		// return all caps
+		if ($allcap)
+		{
+			return self::safeString($string, 'U');
+		}
 		// use the default (original behaviour/convention)
 		return self::safeString($string);
 	}
@@ -5526,38 +5538,42 @@ abstract class ComponentbuilderHelper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = 'Componentbuilder', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $Component = 'Componentbuilder', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 93a24ce12..b01a19532 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -203,7 +203,7 @@ COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NAME_MESSAGE="Error! Please add name here
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NEW="A New Admin Custom Tabs"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION="Permissions"
-COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_DESCRIPTION="control "
+COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_DESCRIPTION="control"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_LABEL="Permission"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_POSITION_DESCRIPTION="position of custom tab"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_POSITION_LABEL="Target"
@@ -549,7 +549,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL="Alias Builder Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_DESCRIPTION="null & zero values"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_LABEL="Allow"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="ARCHIVE"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_ARMSCIIEIGHT_ARMENIAN_MOST_SUITABLE_COLLATION_ARMSCIIEIGHT_GENERAL_CI="armscii8 - ARMSCII-8 Armenian (most suitable collation = armscii8_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_BIN_CHARSET_ARMSCIIEIGHT="armscii8_bin (charset = armscii8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_GENERAL_CI_CHARSET_ARMSCIIEIGHT="armscii8_general_ci (charset = armscii8)"
@@ -942,7 +942,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields &amp; Cond
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CUSTOM_TABS_NOTE_DESCRIPTION="You can add more custom tabs to this admin view, these tabs are generally used for static HTML content or Ajax generated fields/content. You can not have an admin view with only custom tabs, they can only be used as an add-on, not a stand alone."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
-COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=22m20s' target='_blank'>tutorial</a> for more info. "
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=22m20s' target='_blank'>tutorial</a> for more info."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL="Linked Views Options"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=6m19s' target='_blank'>tutorial</a> for more info."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL="Permission Implementation"
@@ -1094,7 +1094,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_REDUNDANT="REDUNDANT"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE="Remove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REPLY="Reply"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
-COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_COPY="Save Copy"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_NEW="Save New"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin View to customise the alias."
@@ -1173,7 +1173,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_TISSIX_HUNDRED_AND_TWE
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type"
-COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="Set the type of view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_BIN_CHARSET_UCSTWO="ucs2_bin (charset = ucs2)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_CROATIAN_CI_CHARSET_UCSTWO="ucs2_croatian_ci (charset = ucs2)"
@@ -1441,18 +1441,18 @@ COM_COMPONENTBUILDER_COMPANY_NAME="Company Name"
 COM_COMPONENTBUILDER_COMPANY_S="Company: %s"
 COM_COMPONENTBUILDER_COMPILER="Compiler"
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
-COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
+COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC="Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
-COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_DESC="The compiler"
 COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS="Compiler Translate Button Access"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the translate button."
+COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the translate button."
 COM_COMPONENTBUILDER_COMPILE_COMPONENT="Compile Component"
 COM_COMPONENTBUILDER_COMPONENTS="Components"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS="Components Admin Views"
@@ -2603,7 +2603,7 @@ COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL="Constant
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ORDERING_LABEL="Ordering"
-COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure. "
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT="Target Path Here"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL="Target Path"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE="Error! Please add target path."
@@ -2767,7 +2767,7 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESC="A count of the number of times this Component Updates has been revised."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESCRIPTION="1.0.0"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_HINT="1.0.0"
-COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL="SQL Update Version"
+COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_MESSAGE="Error! Please add some text here."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE="Version Update"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!"
@@ -2778,6 +2778,7 @@ COM_COMPONENTBUILDER_CONFIG_ACTIVE="Active"
 COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_DESCRIPTION="Would you like to add a prefix to the Joomla menu name of your components"
 COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_LABEL="Add Menu Prefix"
 COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
+COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric"
 COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION="This User will be used to log the API call."
 COM_COMPONENTBUILDER_CONFIG_API_LABEL="API User"
 COM_COMPONENTBUILDER_CONFIG_AUTHOR="Author Info"
@@ -2923,10 +2924,10 @@ COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like
 COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL="Select an editor"
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email."
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT="Email Address Here"
-COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email"
+COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL="From Email"
 COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_DESCRIPTION="The global email address that will be used to set as the reply email. (leave blank for none)"
 COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_HINT="Email Address Here"
-COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL=" Reply to Email"
+COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL="Reply to Email"
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encryption key for the field encryption is set here."
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
 COM_COMPONENTBUILDER_CONFIG_EVERY_DAY="Every Day"
@@ -2999,6 +3000,8 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_MESSAGE="Error! Please add website here."
 COM_COMPONENTBUILDER_CONFIG_FALSE="False"
+COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_DESCRIPTION="The default option only uses alphabetical characters and converts all numbers in field names to the English equivalent like <em>1</em> becomes <b>one</b>.<br />Alphanumeric keeps the numbers unconverted unless it is at the beginning of the field name.<br />Should you change this it will cause a database updates <i>(during your next compilation)</i> for all fields that has numbers in the name of the field. So it is really not a good idea to change this option every so often, you should rather select what you would like to use and keep it like that.<br />All VDM/JCB components work on the <b>Default</b> option."
+COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_LABEL="Field Name Builder<br /><small>(in compiler)</small>"
 COM_COMPONENTBUILDER_CONFIG_FLAT_LOAD="Flat"
 COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS="Folder Paths"
 COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
@@ -3017,7 +3020,7 @@ COM_COMPONENTBUILDER_CONFIG_INACTIVE="Inactive"
 COM_COMPONENTBUILDER_CONFIG_INSTALL_DESCRIPTION="Component locally"
 COM_COMPONENTBUILDER_CONFIG_INSTALL_LABEL="Install"
 COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES="JCB Community Packages"
-COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area.  "
+COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area."
 COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL="Directories"
 COM_COMPONENTBUILDER_CONFIG_LANGUAGE_LABEL="Language"
 COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER="Local Folder"
@@ -3159,7 +3162,7 @@ COM_COMPONENTBUILDER_COPYRIGHT_S="Copyright: %s"
 COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER="Could not clear the tmp folder!"
 COM_COMPONENTBUILDER_CREATE="Create"
 COM_COMPONENTBUILDER_CREATE_A_SNIPPET="create a snippet"
-COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
+COM_COMPONENTBUILDER_CREATE_NEW_S="Create new %s"
 COM_COMPONENTBUILDER_CREATE_S_FOR_THIS_S="Create %s for this %s"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
@@ -3380,7 +3383,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FORWARD_CIRCLE="Forward Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FORWARD_TWO="Forward 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GENERIC="Generic"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin View Get Snippets Button Access"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GRID_TWO="Grid 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEALTH="Health"
@@ -3838,7 +3841,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS="PHP/JS"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT="Replacement"
 COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
-COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_CUSTOM_CODE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Custom Code to customise the alias."
 COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS="Status"
 COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME="System Name"
@@ -4027,7 +4030,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_DESCRIPTION="The type of filter you
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_LABEL="Filter Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR="FunctionVar"
 COM_COMPONENTBUILDER_DYNAMIC_GET_G="g"
-COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM="Getcustom"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM="getCustom"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOMS="getCustoms"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_DESCRIPTION="Set the Method name for this dynamic get."
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_HINT="getMethodName"
@@ -4095,10 +4098,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE="Multiple"
 COM_COMPONENTBUILDER_DYNAMIC_GET_N="n"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME="Name"
-COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_DESCRIPTION="The variable name."
-COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_HINT="variableName"
+COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_DESCRIPTION="Enter Name Here"
+COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_LABEL="Name"
-COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_MESSAGE="Error! Please add variable name here."
+COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_DYNAMIC_GET_NEW="A New Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NN="nn"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NO="No"
@@ -4172,7 +4175,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION="Single row or Multiple ro
 COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL="Return Row Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RR="rr"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
-COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_DYNAMIC_GET_S="s"
 COM_COMPONENTBUILDER_DYNAMIC_GET_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Dynamic Get to customise the alias."
 COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION="Fields to be selected from table."
@@ -4198,7 +4201,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags"
 COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TWEAK="Tweak"
-COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"
@@ -4237,13 +4240,13 @@ COM_COMPONENTBUILDER_EDIT="Edit"
 COM_COMPONENTBUILDER_EDITCREATE_SITE_VIEW="Edit/Create Site View"
 COM_COMPONENTBUILDER_EDITING="Editing"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
-COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
+COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
-COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
+COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date."
 COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_S_FOR_THIS_S="Edit %s for this %s"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
-COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
+COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EDIT_VIEW="Edit View"
 COM_COMPONENTBUILDER_EMAIL="Email"
 COM_COMPONENTBUILDER_EMAIL_S="Email %s"
@@ -4267,7 +4270,7 @@ COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_O
 COM_COMPONENTBUILDER_EXPORTIMPORT_DATA="Export/Import Data"
 COM_COMPONENTBUILDER_EXPORT_COMPLETED="Export Completed!"
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
-COM_COMPONENTBUILDER_EXPORT_DATA_DESC=" Allows users in this group to export data."
+COM_COMPONENTBUILDER_EXPORT_DATA_DESC="Allows users in this group to export data."
 COM_COMPONENTBUILDER_EXPORT_FAILED="Export Failed"
 COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER="Export failed, please try again latter!"
 COM_COMPONENTBUILDER_EXPORT_JCB_PACKAGES="Export JCB Packages"
@@ -4701,7 +4704,7 @@ COM_COMPONENTBUILDER_FIELD_OTHER="Other"
 COM_COMPONENTBUILDER_FIELD_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_FIELD_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
-COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_FIELD_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Field to customise the alias."
 COM_COMPONENTBUILDER_FIELD_SCRIPTS="Scripts"
 COM_COMPONENTBUILDER_FIELD_SELECT_AN_OPTION="Select an option"
@@ -4749,24 +4752,24 @@ COM_COMPONENTBUILDER_GET_PACKAGE="Get Package"
 COM_COMPONENTBUILDER_GET_SNIPPET="Get snippet"
 COM_COMPONENTBUILDER_GET_SNIPPETS="Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group to access get snippets."
+COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the custom admin views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DESC="Get the sinppets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC="Allows the users in this group to access the layouts button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the libraries button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the libraries button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the site views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the site views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the snippets button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the snippets button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the templates button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC="Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY="Get the snippet from gitHub and install it locally"
 COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION="Get the snippet from gitHub and update the local version"
 COM_COMPONENTBUILDER_GLOBAL="Global"
@@ -4876,7 +4879,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_MESSAGE="Error! Please add title here."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE="Type"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_DESCRIPTION="Select the help type."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL="Type"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_URL="Url"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_URL="URL"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_DESCRIPTION="Enter url"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_LABEL="URL"
@@ -4901,7 +4904,7 @@ COM_COMPONENTBUILDER_ICON="Icon"
 COM_COMPONENTBUILDER_IEMAILI_BSB="<i>Email:</i> <b>%s</b>"
 COM_COMPONENTBUILDER_IMPORT_CONTINUE="Continue"
 COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_DATA_DESC=" Allows users in this group to import data."
+COM_COMPONENTBUILDER_IMPORT_DATA_DESC="Allows users in this group to import data."
 COM_COMPONENTBUILDER_IMPORT_ERROR="Import error."
 COM_COMPONENTBUILDER_IMPORT_FAILED="Import Failed"
 COM_COMPONENTBUILDER_IMPORT_FILE_COLUMNS="File Columns"
@@ -4947,7 +4950,7 @@ COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SNIPPETS="Select the file to import
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_TEMPLATES="Select the file to import data to templates."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_VALIDATION_RULES="Select the file to import data to validation_rules."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_URL="Enter file URL"
-COM_COMPONENTBUILDER_IMPORT_SUCCESS="Great! Import successful."
+COM_COMPONENTBUILDER_IMPORT_SUCCESS="Import Success!"
 COM_COMPONENTBUILDER_IMPORT_TABLE_COLUMNS="Table Columns"
 COM_COMPONENTBUILDER_IMPORT_TITLE="Data Importer"
 COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import not found."
@@ -5086,7 +5089,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL="Author"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE="Error! Please add author name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACK="Back"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC="Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM="Bom"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION="Select the file that should be used for licensing all files (files found in: administrator/components/com_componentbuilder/compiler)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_LABEL="Licensing Template"
@@ -5100,9 +5103,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION="To build the compon
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL="Build Backend-views Dynamically"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY="Joomla Component Builder - Backup Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clone button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC="Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME="Companyname"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_DESCRIPTION="Enter Company Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_HINT="Company Name Here"
@@ -5169,10 +5172,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_BUILD_BETA="Dynamic Build (beta)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_INTEGRATION="Dynamic Integration"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT="Editing the Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL="Email"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION="Enter Email"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT="demo@example.com"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL="Email"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE="Error! Please add email address here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION="Enter Author Email"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT="Author Email Here"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL="Author Email"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE="Error! Please author email address here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS="Emptycontributors"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION="Set if a list of empty contributor fields should be added."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_LABEL="Empty Contributor Fields"
@@ -5183,7 +5186,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT="http://www.example.c
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE="Error! Please add link here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the export jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the export jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY="Export Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_DESCRIPTION="The key used to lock the data during export."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT="Export Key Here"
@@ -5195,7 +5198,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE="Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION="The component image (product box) for the dashboard and install page, must be 300px X 300px."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL="Component Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT="Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add JavaScript for the entire back-end. Do not add the script tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript"
@@ -5236,9 +5239,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_HINT="codename"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_DESCRIPTION="Enter Name Here"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Component Name"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_LABEL="Name"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add component name here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW="A New Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO="No"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE="None"
@@ -5252,8 +5255,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION="
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL="Dynamic Builder (mySql) Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_DESCRIPTION="You can add custom files and folders to the component, simply add the files to the administrator/components/com_componentbuilder/custom folder and then select them here.<span id='jform_button_component_files_folders'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL="Adding Custom Files & Folder"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_CROWDIN_DESCRIPTION="
-<div class='alert alert-warning'>
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_CROWDIN_DESCRIPTION="<div class='alert alert-warning'>
 <h4>Feature not ready?</h4>
 <p>We are still working on this integration, so it is not fully ready. Hopefully with the next update.</p>
 </div>
@@ -5278,7 +5280,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL="Dynamic Dash
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_DESCRIPTION="We have moved the views in to their own tabs for your convenience.<span id='jform_button_create_edit_views'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_LABEL="To add views, please open the corresponding tab."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION="In each admin view you can add data from a MySQL Table (this is done in the admin view MySQL tab). Here you can limit that data in relation to this component. This feature is useful when an admin view with demo data is used in more then one component, and you would like to exclude some demo data without creating a new admin view.<span id='jform_button_mysql_tweak_options'></span>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL=" MySql Tweak Options"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL="MySql Tweak Options"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_DESCRIPTION="Do not add the same view twice it will not work. Please <a href='https://youtu.be/39vY66X7GGU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE' target='_blank'>watch this tutorial for more help</a>."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_LABEL="Setting Admin Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION="Only add contributors if you would like them listed on the component dashboard."
@@ -5394,7 +5396,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER="Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION="Select your sales server for this component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL="Sales Server"
@@ -5459,7 +5461,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE="Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Author Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK="Whmcs Buy Link"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_DESCRIPTION="Enter link where your WHMCS License key can be bought."
@@ -5535,7 +5537,7 @@ COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%s Language unpublished."
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
-COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC=" Allows the users in this group to access the build button."
+COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC="Allows the users in this group to access the build button."
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_DESC="The user that created this Language."
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_DESC="The date this Language was created."
@@ -5638,7 +5640,7 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS="Status"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION="The translation strings."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT="Translated String Here"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translated String"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_MESSAGE="Error! Please add translated string here."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of times this Language Translation has been revised."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision"
@@ -5722,7 +5724,7 @@ COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_LAYOUT_EDIT="Editing the Layout"
 COM_COMPONENTBUILDER_LAYOUT_ERROR_UNIQUE_ALIAS="Another Layout has the same alias."
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Button Access"
-COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LAYOUT_ID="Id"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_DESCRIPTION="Add the layout code here."
@@ -5764,7 +5766,7 @@ COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LEFT_IN_TAB="Left in Tab"
 COM_COMPONENTBUILDER_LEFT_OF_TABS="Left of Tabs"
-COM_COMPONENTBUILDER_LIBRARIES="Libraries"
+COM_COMPONENTBUILDER_LIBRARIES="libraries"
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS="Libraries Access"
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS_DESC="Allows the users in this group to access access libraries"
 COM_COMPONENTBUILDER_LIBRARIES_BATCH_OPTIONS="Batch process the selected Libraries"
@@ -5893,7 +5895,7 @@ COM_COMPONENTBUILDER_LIBRARY_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_
 COM_COMPONENTBUILDER_LIBRARY_BEHAVIOUR="Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_BUNDLE="Bundle"
 COM_COMPONENTBUILDER_LIBRARY_CHAIN="Chain"
-COM_COMPONENTBUILDER_LIBRARY_CONFIG="Library Config"
+COM_COMPONENTBUILDER_LIBRARY_CONFIG="Config"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG="Addconfig"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_DESCRIPTION="Setup config fields."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_LABEL="Config"
@@ -5946,7 +5948,7 @@ COM_COMPONENTBUILDER_LIBRARY_EXCLUDE="exclude"
 COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_HINT="Options here"
 COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_LABEL="Field Options"
 COM_COMPONENTBUILDER_LIBRARY_FILE="File"
-COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS="Library Files, Folders & URLs"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS="Files, Folders & URLs"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES="Addfiles"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH="Addfilesfullpath"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION="Add files to this component using the full path."
@@ -6046,7 +6048,7 @@ COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_LABEL="Const
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ORDERING_LABEL="Ordering"
-COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure. "
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure."
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT="Target Path Here"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL="Target Path"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE="Error! Please add target path."
@@ -6066,7 +6068,7 @@ COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LIBRARY_FILE_DESCRIPTION="to library"
 COM_COMPONENTBUILDER_LIBRARY_FILE_LABEL="Target File Linked"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
-COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LIBRARY_HOW="How"
 COM_COMPONENTBUILDER_LIBRARY_HOW_DESCRIPTION="Select how you want to control the behaviour of the library file inclusion."
 COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL="File Behaviour"
@@ -6179,7 +6181,7 @@ COM_COMPONENTBUILDER_NONE_DB="None DB"
 COM_COMPONENTBUILDER_NONE_SELECTED="None selected"
 COM_COMPONENTBUILDER_NOTICE_BOARD="Notice Board"
 COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
-COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
+COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied."
 COM_COMPONENTBUILDER_NOT_SET="not set"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
@@ -6758,7 +6760,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_FORWARD_CIRCLE="Forward Circle"
 COM_COMPONENTBUILDER_SITE_VIEW_FORWARD_TWO="Forward 2"
 COM_COMPONENTBUILDER_SITE_VIEW_GENERIC="Generic"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippets Button Access"
-COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SITE_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_SITE_VIEW_GRID_TWO="Grid 2"
 COM_COMPONENTBUILDER_SITE_VIEW_HEALTH="Health"
@@ -7074,7 +7076,7 @@ COM_COMPONENTBUILDER_SNIPPET_DETAILS="Details"
 COM_COMPONENTBUILDER_SNIPPET_EDIT="Editing the Snippet"
 COM_COMPONENTBUILDER_SNIPPET_ERROR_UNIQUE_ALIAS="Another Snippet has the same alias."
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPET_HEADING="Heading"
 COM_COMPONENTBUILDER_SNIPPET_HEADING_DESCRIPTION="Enter short heading"
 COM_COMPONENTBUILDER_SNIPPET_HEADING_HINT="Your Heading Here"
@@ -7101,12 +7103,12 @@ COM_COMPONENTBUILDER_SNIPPET_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_SNIPPET_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_SNIPPET_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Snippet to customise the alias."
 COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS="Snippet Share Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the share snippets button."
+COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the share snippets button."
 COM_COMPONENTBUILDER_SNIPPET_SNIPPET="Snippet"
 COM_COMPONENTBUILDER_SNIPPET_SNIPPET_HINT="// Add the snippets code here"
 COM_COMPONENTBUILDER_SNIPPET_SNIPPET_LABEL="Snippet"
 COM_COMPONENTBUILDER_SNIPPET_STATUS="Status"
-COM_COMPONENTBUILDER_SNIPPET_TYPE="Snippet Type"
+COM_COMPONENTBUILDER_SNIPPET_TYPE="Type"
 COM_COMPONENTBUILDER_SNIPPET_TYPES="Snippet Types"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS="Snippet Types Access"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS_DESC="Allows the users in this group to access access snippet types"
@@ -7147,7 +7149,7 @@ COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_DESC="The user that created this Sn
 COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_DESC="The date this Snippet Type was created."
 COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_LABEL="Created Date"
-COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION="Description"
+COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION="Snippet Types"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_DESCRIPTION="Enter some description"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_HINT="Description Here"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_LABEL="Description"
@@ -7303,7 +7305,7 @@ COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_TEMPLATE_EDIT="Editing the Template"
 COM_COMPONENTBUILDER_TEMPLATE_ERROR_UNIQUE_ALIAS="Another Template has the same alias."
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets Button Access"
-COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
 COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
@@ -7432,7 +7434,7 @@ COM_COMPONENTBUILDER_UP_TO_DATE="Up to date"
 COM_COMPONENTBUILDER_USAGE="Usage"
 COM_COMPONENTBUILDER_USED_IN="used in"
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
-COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
+COM_COMPONENTBUILDER_USE_BATCH_DESC="Allows users in this group to use batch copy/update method."
 COM_COMPONENTBUILDER_USE_KEY="Use Key"
 COM_COMPONENTBUILDER_VALIDATE="Validate"
 COM_COMPONENTBUILDER_VALIDATES_THAT_THE_VALUE_DOES_NOT_APPEAR_AS_A_USERNAME_ON_THE_SYSTEM_THAT_IS_THAT_IT_IS_A_VALID_NEW_USERNAME_DOES_NOT_SYNTAX_CHECK_IT_AS_A_VALID_NAME="Validates that the value does NOT appear as a username on the system; that is, that it is a valid new username. Does not syntax check it as a valid name."
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
index 3bf832b79..4d342ddc2 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@@ -110,19 +110,19 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
-COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
-COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
+COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC="Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
-COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS="Compiler Translate Button Access"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the translate button."
+COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the translate button."
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS="Components Admin Views Access"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access components admin views"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE="Components Admin Views Batch Use"
@@ -351,7 +351,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this gr
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU="Custom Admin Views Submenu"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin View Get Snippets Button Access"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS="Custom Codes Access"
 COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS_DESC="Allows the users in this group to access access custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE="Custom Codes Batch Use"
@@ -381,7 +381,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to submenu of custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
-COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC="Allows the users in this group to access access dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE="Dynamic Gets Batch Use"
@@ -409,15 +409,15 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
-COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
-COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
+COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
-COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
+COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date."
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
-COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
+COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
-COM_COMPONENTBUILDER_EXPORT_DATA_DESC=" Allows users in this group to export data."
+COM_COMPONENTBUILDER_EXPORT_DATA_DESC="Allows users in this group to export data."
 COM_COMPONENTBUILDER_FIELDS_ACCESS="Fields Access"
 COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC="Allows the users in this group to access access fields"
 COM_COMPONENTBUILDER_FIELDS_BATCH_USE="Fields Batch Use"
@@ -469,25 +469,25 @@ COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to i
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
 COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
-COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group to access get snippets."
+COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the custom admin views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC="Allows the users in this group to access the layouts button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the libraries button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the libraries button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the site views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the site views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the snippets button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the snippets button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the templates button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC="Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS="Help Documents Access"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS_DESC="Allows the users in this group to access access help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE="Help Documents Batch Use"
@@ -513,7 +513,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_DATA_DESC=" Allows users in this group to import data."
+COM_COMPONENTBUILDER_IMPORT_DATA_DESC="Allows users in this group to import data."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC="Allows the users in this group to access access joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE="Joomla Components Batch Use"
@@ -541,17 +541,17 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this g
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to submenu of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC="Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clone button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC="Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the export jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the export jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC="Allows the users in this group to access access languages"
 COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
@@ -575,7 +575,7 @@ COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC="Allows the users in this group to im
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
-COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC=" Allows the users in this group to access the build button."
+COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC="Allows the users in this group to access the build button."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS="Language Translations Access"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC="Allows the users in this group to access access language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE="Language Translations Batch Use"
@@ -627,7 +627,7 @@ COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC="Allows the users in this group to impo
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU="Layouts Submenu"
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to submenu of layout"
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Button Access"
-COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS="Libraries Access"
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS_DESC="Allows the users in this group to access access libraries"
 COM_COMPONENTBUILDER_LIBRARIES_BATCH_USE="Libraries Batch Use"
@@ -689,7 +689,7 @@ COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC="Allows user
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU="Libraries Submenu"
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to submenu of library"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
-COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_MENU="&#10003 Component Builder"
 COM_COMPONENTBUILDER_MENU_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_MENU_COMPILER="Compiler"
@@ -787,7 +787,7 @@ COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC="Allows the users in this group to i
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU="Site Views Submenu"
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of site view"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippets Button Access"
-COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPETS_ACCESS="Snippets Access"
 COM_COMPONENTBUILDER_SNIPPETS_ACCESS_DESC="Allows the users in this group to access access snippets"
 COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE="Snippets Batch Use"
@@ -813,9 +813,9 @@ COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC="Allows the users in this group to imp
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of snippet"
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS="Snippet Share Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the share snippets button."
+COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the share snippets button."
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS="Snippet Types Access"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS_DESC="Allows the users in this group to access access snippet types"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_BATCH_USE="Snippet Types Batch Use"
@@ -859,9 +859,9 @@ COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC="Allows the users in this group to im
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU="Templates Submenu"
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to submenu of template"
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets Button Access"
-COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
-COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
+COM_COMPONENTBUILDER_USE_BATCH_DESC="Allows users in this group to use batch copy/update method."
 COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS="Validation Rules Access"
 COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS_DESC="Allows the users in this group to access access validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE="Validation Rules Batch Use"
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index f1060e295..60b101f90 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -215,10 +215,17 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 3715f696e..f7cbca17b 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -134,10 +134,17 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index ba4bf3597..534c3b3cd 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -87,10 +87,17 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index 34de750b9..0d899b1c5 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -127,10 +127,17 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/field.php b/admin/models/field.php
index 5299679ee..4ee506d06 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -113,10 +113,17 @@ class ComponentbuilderModelField extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 034c109d5..8e12d7c13 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -93,10 +93,17 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index aba4c89d1..cc9b9fe04 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -238,10 +238,17 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 5b0f5c243..76abad48b 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -91,10 +91,17 @@ class ComponentbuilderModelLayout extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/library.php b/admin/models/library.php
index b31ee1b58..113d048e8 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -104,10 +104,17 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php
index 085e4e3e2..6b78fa74d 100644
--- a/admin/models/placeholder.php
+++ b/admin/models/placeholder.php
@@ -71,10 +71,17 @@ class ComponentbuilderModelPlaceholder extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index c834dc5b0..8192eefa8 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -137,10 +137,17 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/template.php b/admin/models/template.php
index 90b76ef76..91d6ceabb 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -91,10 +91,17 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 4bef149a0..ec2992e97 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>1st July, 2019</creationDate>
+	<creationDate>4th July, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/script.php b/script.php
index 1e0439d9d..d093920ee 100644
--- a/script.php
+++ b/script.php
@@ -4124,7 +4124,7 @@ class com_componentbuilderInstallerScript
 			$query = $db->getQuery(true);
 			// Field to update.
 			$fields = array(
-				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"&#187;","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
+				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"»","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","field_name_builder":"1","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
 			);
 			// Condition.
 			$conditions = array(
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index ec7f161ff..09f1078ac 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -132,19 +132,21 @@ abstract class ComponentbuilderHelper
 	/**
 	* Making field names safe
 	*
-	* @input	string   The you would like to make safe
+	* @input	string       The you would like to make safe
+	* @input	boolean      The switch to return an ALL UPPER CASE string
+	* @input	string       The string to use in white space
 	*
 	* @returns string on success
 	**/
-	public static function safeFieldName($string, $spacer = '_')
+	public static function safeFieldName($string, $allcap = false, $spacer = '_')
 	{
 		// get global value
 		if (self::$fieldNameBuilder === false)
 		{
-			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 0); // change this to 1 for testing the new convention
+			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 1);
 		}
 		// use the new convention
-		if (1 == self::$fieldNameBuilder)
+		if (2 == self::$fieldNameBuilder)
 		{
 			// 0nly continue if we have a string
 			if (self::checkString($string))
@@ -162,12 +164,22 @@ abstract class ComponentbuilderHelper
 				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
 				// replace white space with underscore (SAFEST OPTION)
 				$string = preg_replace('/\s+/', $spacer, $string);
+				// return all caps
+				if ($allcap)
+				{
+					return strtoupper($string);
+				}
 				// default is to return lower
 				return strtolower($string);
 			}
 			// not a string
 			return '';
 		}
+		// return all caps
+		if ($allcap)
+		{
+			return self::safeString($string, 'U');
+		}
 		// use the default (original behaviour/convention)
 		return self::safeString($string);
 	}
@@ -4805,38 +4817,42 @@ abstract class ComponentbuilderHelper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = 'Componentbuilder', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $Component = 'Componentbuilder', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
-- 
2.40.1


From 504abe475128020323cfeb7e035f8827a3ad39c6 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 5 Jul 2019 18:19:34 +0200
Subject: [PATCH 25/26] added sponsor banners to JCB.

---
 README.md                          |  4 ++--
 admin/README.txt                   |  4 ++--
 admin/helpers/componentbuilder.php | 10 ++++++----
 componentbuilder.xml               |  2 +-
 site/helpers/componentbuilder.php  | 10 ++++++----
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5fb70e3b0..90f348def 100644
--- a/README.md
+++ b/README.md
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th July, 2019
++ *Last Build*: 5th July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211563**
++ *Line count*: **211567**
 + *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 5fb70e3b0..90f348def 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th July, 2019
++ *Last Build*: 5th July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211563**
++ *Line count*: **211567**
 + *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 7ead4e459..3c8160c6f 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -1371,12 +1371,14 @@ abstract class ComponentbuilderHelper
 		// The banners by size
 		'banner' => array(
 			'728-90' => array(
-				'<a href="https://volunteers.joomla.org/" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-wide.gif" alt="Joomla! Volunteers Portal" width="728" height="90" border="0"></a>',
-				'<a href="https://magazine.joomla.org" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img alt="Joomla! Community Magazine | Because community matters..." src="https://magazine.joomla.org/images/banners/JCM_2010_728x90.png" width="728" height="90" border="0" /></a>'
+				'<a href="https://vdm.bz/joomla-volunteers" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-wide.gif" alt="Joomla! Volunteers Portal" width="728" height="90" border="0"></a>',
+				'<a href="https://vdm.bz/joomla-magazine" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img alt="Joomla! Community Magazine | Because community matters..." src="https://magazine.joomla.org/images/banners/JCM_2010_728x90.png" width="728" height="90" border="0" /></a>',
+				'<a href="https://vdm.bz/jcb-sponsor-tlwebdesign" target="_blank" title="tlwebdesign a JCB sponsor | Because community matters..."><img alt="tlwebdesign a JCB sponsor | Because community matters..." src="https://www.joomlacomponentbuilder.com/images/banners/tlwebdesign_jcb_sponsor_728_90.png" width="728" height="90" border="0" /></a>',
+				'<a href="https://vdm.bz/jcb-sponsor-vdm" target="_blank" title="VDM a JCB sponsor | Because community matters..."><img alt="VDM a JCB sponsor | Because community matters..." src="https://www.joomlacomponentbuilder.com/images/banners/vdm_jcb_sponsor_728_90.gif" width="728" height="90" border="0" /></a>'
 			),
 			'160-600' => array(
-				'<a href="https://volunteers.joomla.org/" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-tall.gif" alt="Joomla! Volunteers Portal" width="160" height="600" border="0"></a>',
-				'<a href="https://magazine.joomla.org" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img src="https://magazine.joomla.org/images/banners/JCM_2010_120x600.png" alt="Joomla! Community Magazine | Because community matters..." width="120" height="600" border="0"/></a>'
+				'<a href="https://vdm.bz/joomla-volunteers" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-tall.gif" alt="Joomla! Volunteers Portal" width="160" height="600" border="0"></a>',
+				'<a href="https://vdm.bz/joomla-magazine" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img src="https://magazine.joomla.org/images/banners/JCM_2010_120x600.png" alt="Joomla! Community Magazine | Because community matters..." width="120" height="600" border="0"/></a>'
 			)
 		),
 		// The build-gif by size
diff --git a/componentbuilder.xml b/componentbuilder.xml
index ec2992e97..683e656ef 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>4th July, 2019</creationDate>
+	<creationDate>5th July, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index 09f1078ac..44c142113 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -1371,12 +1371,14 @@ abstract class ComponentbuilderHelper
 		// The banners by size
 		'banner' => array(
 			'728-90' => array(
-				'<a href="https://volunteers.joomla.org/" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-wide.gif" alt="Joomla! Volunteers Portal" width="728" height="90" border="0"></a>',
-				'<a href="https://magazine.joomla.org" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img alt="Joomla! Community Magazine | Because community matters..." src="https://magazine.joomla.org/images/banners/JCM_2010_728x90.png" width="728" height="90" border="0" /></a>'
+				'<a href="https://vdm.bz/joomla-volunteers" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-wide.gif" alt="Joomla! Volunteers Portal" width="728" height="90" border="0"></a>',
+				'<a href="https://vdm.bz/joomla-magazine" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img alt="Joomla! Community Magazine | Because community matters..." src="https://magazine.joomla.org/images/banners/JCM_2010_728x90.png" width="728" height="90" border="0" /></a>',
+				'<a href="https://vdm.bz/jcb-sponsor-tlwebdesign" target="_blank" title="tlwebdesign a JCB sponsor | Because community matters..."><img alt="tlwebdesign a JCB sponsor | Because community matters..." src="https://www.joomlacomponentbuilder.com/images/banners/tlwebdesign_jcb_sponsor_728_90.png" width="728" height="90" border="0" /></a>',
+				'<a href="https://vdm.bz/jcb-sponsor-vdm" target="_blank" title="VDM a JCB sponsor | Because community matters..."><img alt="VDM a JCB sponsor | Because community matters..." src="https://www.joomlacomponentbuilder.com/images/banners/vdm_jcb_sponsor_728_90.gif" width="728" height="90" border="0" /></a>'
 			),
 			'160-600' => array(
-				'<a href="https://volunteers.joomla.org/" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-tall.gif" alt="Joomla! Volunteers Portal" width="160" height="600" border="0"></a>',
-				'<a href="https://magazine.joomla.org" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img src="https://magazine.joomla.org/images/banners/JCM_2010_120x600.png" alt="Joomla! Community Magazine | Because community matters..." width="120" height="600" border="0"/></a>'
+				'<a href="https://vdm.bz/joomla-volunteers" target="_blank" title="Joomla! Volunteers Portal"><img src="https://cdn.joomla.org/volunteers/joomla-heart-tall.gif" alt="Joomla! Volunteers Portal" width="160" height="600" border="0"></a>',
+				'<a href="https://vdm.bz/joomla-magazine" target="_blank" title="Joomla! Community Magazine | Because community matters..."><img src="https://magazine.joomla.org/images/banners/JCM_2010_120x600.png" alt="Joomla! Community Magazine | Because community matters..." width="120" height="600" border="0"/></a>'
 			)
 		),
 		// The build-gif by size
-- 
2.40.1


From 3497104f41b76643c7226f05bf146dfdc6676d6d Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sun, 7 Jul 2019 00:29:35 +0200
Subject: [PATCH 26/26] Added some more events to compiler. Added new helper
 method to make safeClassFunctionName.

---
 README.md                                      |  8 ++++----
 admin/README.txt                               |  8 ++++----
 admin/helpers/compiler.php                     | 16 ++++++++++++++--
 admin/helpers/componentbuilder.php             | 18 ++++++++++++++++++
 .../en-GB/en-GB.com_componentbuilder.ini       |  2 +-
 componentbuilder.xml                           |  6 +++---
 componentbuilder_update_server.xml             |  6 +++---
 script.php                                     |  2 +-
 site/helpers/componentbuilder.php              | 18 ++++++++++++++++++
 9 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 90f348def..d62f0765e 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.20) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.21) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th July, 2019
-+ *Version*: 2.9.20
++ *Last Build*: 6th July, 2019
++ *Version*: 2.9.21
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211567**
++ *Line count*: **211603**
 + *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/README.txt b/admin/README.txt
index 90f348def..d62f0765e 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -12,7 +12,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.20) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.9.21) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -146,11 +146,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 5th July, 2019
-+ *Version*: 2.9.20
++ *Last Build*: 6th July, 2019
++ *Version*: 2.9.21
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211567**
++ *Line count*: **211603**
 + *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php
index 94a26fdbb..695c72aaa 100644
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@@ -459,20 +459,28 @@ class Compiler extends Infusion
 		{
 			// set the repo path
 			$repoFullPath = $this->repoPath . '/com_' . $this->componentData->sales_name . '__joomla_' . $this->joomlaVersion;
+			// Trigger Event: jcb_ce_onBeforeUpdateRepo
+			$this->triggerEvent('jcb_ce_onBeforeUpdateRepo', array(&$this->componentContext, &$this->componentPath, &$repoFullPath, &$this->componentData));
 			// remove old data
 			$this->removeFolder($repoFullPath, $this->componentData->toignore);
 			// set the new data
 			JFolder::copy($this->componentPath, $repoFullPath, '', true);
+			// Trigger Event: jcb_ce_onAfterUpdateRepo
+			$this->triggerEvent('jcb_ce_onAfterUpdateRepo', array(&$this->componentContext, &$this->componentPath, &$repoFullPath, &$this->componentData));
 		}
 		// the name of the zip file to create
 		$this->filepath = $this->tempPath . '/' . $this->componentFolderName . '.zip';
-
+		// Trigger Event: jcb_ce_onBeforeZipComponent
+		$this->triggerEvent('jcb_ce_onBeforeZipComponent', array(&$this->componentContext, &$this->componentPath, &$this->filepath, &$this->tempPath, &$this->componentFolderName, &$this->componentData));
 		//create the zip file
 		if (ComponentbuilderHelper::zip($this->componentPath, $this->filepath))
 		{
-			// now move to backup if zip was made and backup is requered
+			// now move to backup if zip was made and backup is required
 			if ($this->backupPath && $this->dynamicIntegration)
 			{
+				// Trigger Event: jcb_ce_onBeforeBackupZip
+				$this->triggerEvent('jcb_ce_onBeforeBackupZip', array(&$this->componentContext, &$this->filepath, &$this->tempPath, &$this->backupPath, &$this->componentData));
+				// copy the zip to backup path
 				JFile::copy($this->filepath, $this->backupPath);
 			}
 
@@ -482,10 +490,14 @@ class Compiler extends Infusion
 				// make sure we have the correct file
 				if (isset($this->componentData->sales_server))
 				{
+					// Trigger Event: jcb_ce_onBeforeMoveToServer
+					$this->triggerEvent('jcb_ce_onBeforeMoveToServer', array(&$this->componentContext, &$this->filepath, &$this->tempPath, &$this->componentSalesName, &$this->componentData));
 					// move to server
 					ComponentbuilderHelper::moveToServer($this->filepath, $this->componentSalesName . '.zip', (int) $this->componentData->sales_server, $this->componentData->sales_server_protocol);
 				}
 			}
+			// Trigger Event: jcb_ce_onAfterZipComponent
+			$this->triggerEvent('jcb_ce_onAfterZipComponent', array(&$this->componentContext, &$this->filepath, &$this->tempPath, &$this->componentFolderName, &$this->componentData));
 			// remove the component folder since we are done
 			if ($this->removeFolder($this->componentPath))
 			{
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 3c8160c6f..67182ca26 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -124,6 +124,24 @@ abstract class ComponentbuilderHelper
 		'JPATH_THEMES' => JPATH_THEMES
 	);
 
+	/**
+	* Making class or function name safe
+	*
+	* @input	string       The name you would like to make safe
+	*
+	* @returns string on success
+	**/
+	public static function safeClassFunctionName($name)
+	{
+		// remove numbers if the first character is a number
+		if (is_numeric(substr($name, 0, 1)))
+		{
+			$name = self::replaceNumbers($name);
+		}
+		// remove all spaces and strange characters
+		return trim(reg_replace("/[^A-Za-z0-9]/", '', $name));
+	}
+
 	/**
 	* The field builder switch
 	**/
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index b01a19532..3968e9ea5 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -5257,7 +5257,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_DESCRIPTION="
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL="Adding Custom Files & Folder"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_CROWDIN_DESCRIPTION="<div class='alert alert-warning'>
 <h4>Feature not ready?</h4>
-<p>We are still working on this integration, so it is not fully ready. Hopefully with the next update.</p>
+<p>We are still working on this integration, so it is not fully ready.</p>
 </div>
 <div id='crowdin_information_box'>
 <div class='alert alert-info'>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 683e656ef..91d56596e 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>5th July, 2019</creationDate>
+	<creationDate>6th July, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.9.20</version>
+	<version>2.9.21</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.9.20)</h1>
+		<h1>Component Builder (v.2.9.21)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index fabcca403..6b51e4d31 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -687,7 +687,7 @@
 		<version>2.9.19</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.20/JCB_v2.9.20.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.21/JCB_v2.9.21.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
@@ -701,10 +701,10 @@
 		<description>Builds Complex Joomla Components</description>
 		<element>com_componentbuilder</element>
 		<type>component</type>
-		<version>2.9.20</version>
+		<version>2.9.21</version>
 		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
 		<downloads>
-			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.20/JCB_v2.9.20.zip</downloadurl>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.9.21/JCB_v2.9.21.zip</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
diff --git a/script.php b/script.php
index d093920ee..ddd8f71d3 100644
--- a/script.php
+++ b/script.php
@@ -5426,7 +5426,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.9.20 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.9.21 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index 44c142113..2b4801c52 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -124,6 +124,24 @@ abstract class ComponentbuilderHelper
 		'JPATH_THEMES' => JPATH_THEMES
 	);
 
+	/**
+	* Making class or function name safe
+	*
+	* @input	string       The name you would like to make safe
+	*
+	* @returns string on success
+	**/
+	public static function safeClassFunctionName($name)
+	{
+		// remove numbers if the first character is a number
+		if (is_numeric(substr($name, 0, 1)))
+		{
+			$name = self::replaceNumbers($name);
+		}
+		// remove all spaces and strange characters
+		return trim(reg_replace("/[^A-Za-z0-9]/", '', $name));
+	}
+
 	/**
 	* The field builder switch
 	**/
-- 
2.40.1