diff --git a/README.md b/README.md
index 3a5feb7ed..b2184864b 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*: 10th September, 2019
++ *Last Build*: 12th September, 2019
 + *Version*: 2.10.1
 + *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*: **251895**
++ *Line count*: **252364**
 + *Field count*: **1345**
 + *File count*: **1608**
 + *Folder count*: **253**
diff --git a/admin/README.txt b/admin/README.txt
index 3a5feb7ed..b2184864b 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*: 10th September, 2019
++ *Last Build*: 12th September, 2019
 + *Version*: 2.10.1
 + *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*: **251895**
++ *Line count*: **252364**
 + *Field count*: **1345**
 + *File count*: **1608**
 + *Folder count*: **253**
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 4522eaebb..063e97683 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -7317,8 +7317,8 @@ class Get
 				$code = $this->reversePlaceholders($code, $placeholders, $target, $query[2], $query[1], $query[0]);
 				// update the GUI/Tables/Database
 				$object = new stdClass();
-				$object->id = (int) $target[2];
-				$object->{$target[1]} = base64_encode($code); // (TODO) this may not always work... 
+				$object->id = (int) $query[2];
+				$object->{$query[1]} = base64_encode($code); // (TODO) this may not always work... 
 				// update the value in GUI
 				$this->db->updateObject('#__componentbuilder_' . (string) $query[0], $object, 'id');
 			}
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index ae37c1e1f..9c616de36 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -2459,8 +2459,9 @@ abstract class ComponentbuilderHelper
 				if (($repoData = self::getFileContents($_url)) !== false && self::checkJson($repoData))
 				{
 					$github_returned = json_decode($repoData);
-					if (self::checkString($target) && self::checkObject($github_returned) &&
-						isset($github_returned->{$target}) && self::checkArray($github_returned->{$target}) )
+					if (self::checkString($target) &&
+						( (self::checkObject($github_returned) && isset($github_returned->{$target}) && self::checkArray($github_returned->{$target})) ||
+						(self::checkArray($github_returned) && isset($github_returned[$target]) && self::checkArray($github_returned[$target])) ))
 					{
 						if ('nomemory' !== $type)
 						{
@@ -2468,7 +2469,7 @@ abstract class ComponentbuilderHelper
 							self::set($type, $repoData);
 						}
 					}
-					elseif (!self::checkString($target) && self::checkObject($github_returned) && !isset($github_returned->message))
+					elseif (!self::checkString($target) && (self::checkArray($github_returned) || (self::checkObject($github_returned) && !isset($github_returned->message))))
 					{
 						if ('nomemory' !== $type)
 						{
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 24bfe568d..f346c157b 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -4772,18 +4772,18 @@ COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT="Datadefault"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_DESCRIPTION="The data default value for mysql"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_LABEL="Data Default"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER="Datadefault Other"
-COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_DESCRIPTION="The other default data for mysql"
+COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_DESCRIPTION="The other default data for selected data type"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_HINT="Other Default Here"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_LABEL="Other Default"
 COM_COMPONENTBUILDER_FIELDTYPE_DATADEFAULT_OTHER_MESSAGE="Error! Please add other default here."
 COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT="Datalenght"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION="The data length or value for mysql (size)"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL="Data Length/Values"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION="The data length for selected data type (size)"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_LABEL="Data Length"
 COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER="Datalenght Other"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION="The other data length/values for mysql"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION="The other data length for selected data type"
 COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT="Other Here"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL="Other"
-COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length/values here."
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_LABEL="Other Length"
+COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length here."
 COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE="Datatype"
 COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_DESCRIPTION="The data type for mysql"
 COM_COMPONENTBUILDER_FIELDTYPE_DATATYPE_LABEL="Data Type"
@@ -4919,18 +4919,18 @@ COM_COMPONENTBUILDER_FIELD_DATADEFAULT="Datadefault"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION="The data default value for mysql"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL="Data Default"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER="Datadefault Other"
-COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION="The other default data for mysql"
+COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION="The other default data for selected data type"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT="Other Default Here"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL="Other Default"
 COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE="Error! Please add other default here."
 COM_COMPONENTBUILDER_FIELD_DATALENGHT="Datalenght"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION="The data length or value for mysql (size)"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL="Data Length/Values"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION="The data length for selected data type (size)"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL="Data Length"
 COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER="Datalenght Other"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION="The other data length/values for mysql"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION="The other data length for selected data type"
 COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT="Other Here"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL="Other"
-COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length/values here."
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL="Other Length"
+COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE="Error! Please add other data length here."
 COM_COMPONENTBUILDER_FIELD_DATATYPE="Datatype"
 COM_COMPONENTBUILDER_FIELD_DATATYPE_DESCRIPTION="The data type for mysql"
 COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL="Data Type"
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 32758b02f..6c42cd144 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->vxwfields;
+$items = $displayData->vxyfields;
 $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 03920a738..007dc427b 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->vyglinked_components;
+$items = $displayData->vyilinked_components;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 463e17cdb..d3d3d639c 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -203,7 +203,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVxwfields()
+	public function getVxyfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -291,13 +291,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVxwfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVxyfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVxwfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVxyfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVxwfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVxyfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVxwfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVxyfields($item->store, 'store');
 				}
 			}
 
@@ -311,7 +311,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationVxwfields($value,$name)
+	public function selectionTranslationVxyfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index 2da271b04..d644d56da 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -13,6 +13,7 @@ jform_vvvvwbtvxl_required = false;
 jform_vvvvwbuvxm_required = false;
 jform_vvvvwbvvxn_required = false;
 jform_vvvvwbwvxo_required = false;
+jform_vvvvwbxvxp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -29,21 +30,24 @@ jQuery(document).ready(function()
 	var datatype_vvvvwbw = jQuery("#jform_datatype").val();
 	vvvvwbw(datatype_vvvvwbw);
 
-	var store_vvvvwbx = jQuery("#jform_store").val();
 	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
-	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+	vvvvwbx(datatype_vvvvwbx);
 
-	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwbz(add_css_view_vvvvwbz);
+	var store_vvvvwby = jQuery("#jform_store").val();
+	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	vvvvwby(store_vvvvwby,datatype_vvvvwby);
 
-	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwca(add_css_views_vvvvwca);
+	var add_css_view_vvvvwca = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwca(add_css_view_vvvvwca);
 
-	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_view_footer_vvvvwcb);
+	var add_css_views_vvvvwcb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwcb(add_css_views_vvvvwcb);
 
-	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_views_footer_vvvvwcc);
+	var add_javascript_view_footer_vvvvwcc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwcc(add_javascript_view_footer_vvvvwcc);
+
+	var add_javascript_views_footer_vvvvwcd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwcd(add_javascript_views_footer_vvvvwcd);
 });
 
 // the vvvvwbt function
@@ -178,7 +182,6 @@ function vvvvwbv(datatype_vvvvwbv)
 	if (datatype)
 	{
 		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_vvvvwbvvxn_required)
@@ -193,7 +196,6 @@ function vvvvwbv(datatype_vvvvwbv)
 	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_vvvvwbvvxn_required)
@@ -237,27 +239,27 @@ function vvvvwbw(datatype_vvvvwbw)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
-		// add required attribute to store field
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		// add required attribute to datalenght field
 		if (jform_vvvvwbwvxo_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('datalenght',0);
+			jQuery('#jform_datalenght').prop('required','required');
+			jQuery('#jform_datalenght').attr('aria-required',true);
+			jQuery('#jform_datalenght').addClass('required');
 			jform_vvvvwbwvxo_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
-		// remove required attribute from store field
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		// remove required attribute from datalenght field
 		if (!jform_vvvvwbwvxo_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('datalenght',1);
+			jQuery('#jform_datalenght').removeAttr('required');
+			jQuery('#jform_datalenght').removeAttr('aria-required');
+			jQuery('#jform_datalenght').removeClass('required');
 			jform_vvvvwbwvxo_required = true;
 		}
 	}
@@ -267,7 +269,7 @@ function vvvvwbw(datatype_vvvvwbw)
 function datatype_vvvvwbw_SomeFunc(datatype_vvvvwbw)
 {
 	// set the function logic
-	if (datatype_vvvvwbw == 'CHAR' || datatype_vvvvwbw == 'VARCHAR' || datatype_vvvvwbw == 'TEXT' || datatype_vvvvwbw == 'MEDIUMTEXT' || datatype_vvvvwbw == 'LONGTEXT' || datatype_vvvvwbw == 'BLOB' || datatype_vvvvwbw == 'TINYBLOB' || datatype_vvvvwbw == 'MEDIUMBLOB' || datatype_vvvvwbw == 'LONGBLOB')
+	if (datatype_vvvvwbw == 'CHAR' || datatype_vvvvwbw == 'VARCHAR' || datatype_vvvvwbw == 'INT' || datatype_vvvvwbw == 'TINYINT' || datatype_vvvvwbw == 'BIGINT' || datatype_vvvvwbw == 'FLOAT' || datatype_vvvvwbw == 'DECIMAL' || datatype_vvvvwbw == 'DOUBLE')
 	{
 		return true;
 	}
@@ -275,20 +277,8 @@ function datatype_vvvvwbw_SomeFunc(datatype_vvvvwbw)
 }
 
 // the vvvvwbx function
-function vvvvwbx(store_vvvvwbx,datatype_vvvvwbx)
+function vvvvwbx(datatype_vvvvwbx)
 {
-	if (isSet(store_vvvvwbx) && store_vvvvwbx.constructor !== Array)
-	{
-		var temp_vvvvwbx = store_vvvvwbx;
-		var store_vvvvwbx = [];
-		store_vvvvwbx.push(temp_vvvvwbx);
-	}
-	else if (!isSet(store_vvvvwbx))
-	{
-		var store_vvvvwbx = [];
-	}
-	var store = store_vvvvwbx.some(store_vvvvwbx_SomeFunc);
-
 	if (isSet(datatype_vvvvwbx) && datatype_vvvvwbx.constructor !== Array)
 	{
 		var temp_vvvvwbx = datatype_vvvvwbx;
@@ -303,27 +293,34 @@ function vvvvwbx(store_vvvvwbx,datatype_vvvvwbx)
 
 
 	// 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_vvvvwbxvxp_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwbxvxp_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_vvvvwbxvxp_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwbxvxp_required = true;
+		}
 	}
 }
 
-// the vvvvwbx Some function
-function store_vvvvwbx_SomeFunc(store_vvvvwbx)
-{
-	// set the function logic
-	if (store_vvvvwbx == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbx Some function
 function datatype_vvvvwbx_SomeFunc(datatype_vvvvwbx)
 {
@@ -335,11 +332,72 @@ function datatype_vvvvwbx_SomeFunc(datatype_vvvvwbx)
 	return false;
 }
 
-// the vvvvwbz function
-function vvvvwbz(add_css_view_vvvvwbz)
+// the vvvvwby function
+function vvvvwby(store_vvvvwby,datatype_vvvvwby)
+{
+	if (isSet(store_vvvvwby) && store_vvvvwby.constructor !== Array)
+	{
+		var temp_vvvvwby = store_vvvvwby;
+		var store_vvvvwby = [];
+		store_vvvvwby.push(temp_vvvvwby);
+	}
+	else if (!isSet(store_vvvvwby))
+	{
+		var store_vvvvwby = [];
+	}
+	var store = store_vvvvwby.some(store_vvvvwby_SomeFunc);
+
+	if (isSet(datatype_vvvvwby) && datatype_vvvvwby.constructor !== Array)
+	{
+		var temp_vvvvwby = datatype_vvvvwby;
+		var datatype_vvvvwby = [];
+		datatype_vvvvwby.push(temp_vvvvwby);
+	}
+	else if (!isSet(datatype_vvvvwby))
+	{
+		var datatype_vvvvwby = [];
+	}
+	var datatype = datatype_vvvvwby.some(datatype_vvvvwby_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 vvvvwby Some function
+function store_vvvvwby_SomeFunc(store_vvvvwby)
 {
 	// set the function logic
-	if (add_css_view_vvvvwbz == 1)
+	if (store_vvvvwby == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwby Some function
+function datatype_vvvvwby_SomeFunc(datatype_vvvvwby)
+{
+	// set the function logic
+	if (datatype_vvvvwby == 'CHAR' || datatype_vvvvwby == 'VARCHAR' || datatype_vvvvwby == 'TEXT' || datatype_vvvvwby == 'MEDIUMTEXT' || datatype_vvvvwby == 'LONGTEXT' || datatype_vvvvwby == 'BLOB' || datatype_vvvvwby == 'TINYBLOB' || datatype_vvvvwby == 'MEDIUMBLOB' || datatype_vvvvwby == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwca function
+function vvvvwca(add_css_view_vvvvwca)
+{
+	// set the function logic
+	if (add_css_view_vvvvwca == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
 	}
@@ -349,11 +407,11 @@ function vvvvwbz(add_css_view_vvvvwbz)
 	}
 }
 
-// the vvvvwca function
-function vvvvwca(add_css_views_vvvvwca)
+// the vvvvwcb function
+function vvvvwcb(add_css_views_vvvvwcb)
 {
 	// set the function logic
-	if (add_css_views_vvvvwca == 1)
+	if (add_css_views_vvvvwcb == 1)
 	{
 		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 	}
@@ -363,11 +421,11 @@ function vvvvwca(add_css_views_vvvvwca)
 	}
 }
 
-// the vvvvwcb function
-function vvvvwcb(add_javascript_view_footer_vvvvwcb)
+// the vvvvwcc function
+function vvvvwcc(add_javascript_view_footer_vvvvwcc)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwcb == 1)
+	if (add_javascript_view_footer_vvvvwcc == 1)
 	{
 		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 	}
@@ -377,11 +435,11 @@ function vvvvwcb(add_javascript_view_footer_vvvvwcb)
 	}
 }
 
-// the vvvvwcc function
-function vvvvwcc(add_javascript_views_footer_vvvvwcc)
+// the vvvvwcd function
+function vvvvwcd(add_javascript_views_footer_vvvvwcd)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwcc == 1)
+	if (add_javascript_views_footer_vvvvwcd == 1)
 	{
 		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
 	}
diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml
index 05f4c885c..bdd33a2e7 100644
--- a/admin/models/forms/field.xml
+++ b/admin/models/forms/field.xml
@@ -300,6 +300,7 @@
 			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
 			class="btn-group"
 			multiple="false"
+			required="true"
 			default="">
 			<!-- Option Set. -->
 			<option value="">
@@ -393,10 +394,8 @@
 			maxlength="50"
 			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
 			class="text_area"
-			readonly="false"
-			disabled="false"
 			required="true"
-			filter="STRING"
+			filter="INT"
 			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
 		/>
diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js
index 3dcab48f6..7fafdee07 100644
--- a/admin/models/forms/fieldtype.js
+++ b/admin/models/forms/fieldtype.js
@@ -9,82 +9,87 @@
  */
 
 // Some Global Values
-jform_vvvvwcdvxp_required = false;
-jform_vvvvwcfvxq_required = false;
-jform_vvvvwchvxr_required = false;
+jform_vvvvwcevxq_required = false;
+jform_vvvvwcgvxr_required = false;
 jform_vvvvwcivxs_required = false;
-jform_vvvvwcjvxt_required = false;
-jform_vvvvwcovxu_required = false;
-jform_vvvvwcovxv_required = false;
+jform_vvvvwckvxt_required = false;
+jform_vvvvwclvxu_required = false;
+jform_vvvvwcmvxv_required = false;
+jform_vvvvwcrvxw_required = false;
+jform_vvvvwcrvxx_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
+	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
 
-	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
+	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
 
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
-
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
 
-	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
 
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
 
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
-
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
 
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(has_defaults_vvvvwco);
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
+
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcr(has_defaults_vvvvwcr);
 });
 
-// the vvvvwcd function
-function vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd)
+// the vvvvwce function
+function vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce)
 {
-	if (isSet(datalenght_vvvvwcd) && datalenght_vvvvwcd.constructor !== Array)
+	if (isSet(datalenght_vvvvwce) && datalenght_vvvvwce.constructor !== Array)
 	{
-		var temp_vvvvwcd = datalenght_vvvvwcd;
-		var datalenght_vvvvwcd = [];
-		datalenght_vvvvwcd.push(temp_vvvvwcd);
+		var temp_vvvvwce = datalenght_vvvvwce;
+		var datalenght_vvvvwce = [];
+		datalenght_vvvvwce.push(temp_vvvvwce);
 	}
-	else if (!isSet(datalenght_vvvvwcd))
+	else if (!isSet(datalenght_vvvvwce))
 	{
-		var datalenght_vvvvwcd = [];
+		var datalenght_vvvvwce = [];
 	}
-	var datalenght = datalenght_vvvvwcd.some(datalenght_vvvvwcd_SomeFunc);
+	var datalenght = datalenght_vvvvwce.some(datalenght_vvvvwce_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwcd) && has_defaults_vvvvwcd.constructor !== Array)
+	if (isSet(has_defaults_vvvvwce) && has_defaults_vvvvwce.constructor !== Array)
 	{
-		var temp_vvvvwcd = has_defaults_vvvvwcd;
-		var has_defaults_vvvvwcd = [];
-		has_defaults_vvvvwcd.push(temp_vvvvwcd);
+		var temp_vvvvwce = has_defaults_vvvvwce;
+		var has_defaults_vvvvwce = [];
+		has_defaults_vvvvwce.push(temp_vvvvwce);
 	}
-	else if (!isSet(has_defaults_vvvvwcd))
+	else if (!isSet(has_defaults_vvvvwce))
 	{
-		var has_defaults_vvvvwcd = [];
+		var has_defaults_vvvvwce = [];
 	}
-	var has_defaults = has_defaults_vvvvwcd.some(has_defaults_vvvvwcd_SomeFunc);
+	var has_defaults = has_defaults_vvvvwce.some(has_defaults_vvvvwce_SomeFunc);
 
 
 	// set this function logic
@@ -92,78 +97,78 @@ function vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwcdvxp_required)
+		if (jform_vvvvwcevxq_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_vvvvwcdvxp_required = false;
+			jform_vvvvwcevxq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwcdvxp_required)
+		if (!jform_vvvvwcevxq_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_vvvvwcdvxp_required = true;
+			jform_vvvvwcevxq_required = true;
 		}
 	}
 }
 
-// the vvvvwcd Some function
-function datalenght_vvvvwcd_SomeFunc(datalenght_vvvvwcd)
+// the vvvvwce Some function
+function datalenght_vvvvwce_SomeFunc(datalenght_vvvvwce)
 {
 	// set the function logic
-	if (datalenght_vvvvwcd == 'Other')
+	if (datalenght_vvvvwce == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcd Some function
-function has_defaults_vvvvwcd_SomeFunc(has_defaults_vvvvwcd)
+// the vvvvwce Some function
+function has_defaults_vvvvwce_SomeFunc(has_defaults_vvvvwce)
 {
 	// set the function logic
-	if (has_defaults_vvvvwcd == 1)
+	if (has_defaults_vvvvwce == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcf function
-function vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf)
+// the vvvvwcg function
+function vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg)
 {
-	if (isSet(datadefault_vvvvwcf) && datadefault_vvvvwcf.constructor !== Array)
+	if (isSet(datadefault_vvvvwcg) && datadefault_vvvvwcg.constructor !== Array)
 	{
-		var temp_vvvvwcf = datadefault_vvvvwcf;
-		var datadefault_vvvvwcf = [];
-		datadefault_vvvvwcf.push(temp_vvvvwcf);
+		var temp_vvvvwcg = datadefault_vvvvwcg;
+		var datadefault_vvvvwcg = [];
+		datadefault_vvvvwcg.push(temp_vvvvwcg);
 	}
-	else if (!isSet(datadefault_vvvvwcf))
+	else if (!isSet(datadefault_vvvvwcg))
 	{
-		var datadefault_vvvvwcf = [];
+		var datadefault_vvvvwcg = [];
 	}
-	var datadefault = datadefault_vvvvwcf.some(datadefault_vvvvwcf_SomeFunc);
+	var datadefault = datadefault_vvvvwcg.some(datadefault_vvvvwcg_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwcf) && has_defaults_vvvvwcf.constructor !== Array)
+	if (isSet(has_defaults_vvvvwcg) && has_defaults_vvvvwcg.constructor !== Array)
 	{
-		var temp_vvvvwcf = has_defaults_vvvvwcf;
-		var has_defaults_vvvvwcf = [];
-		has_defaults_vvvvwcf.push(temp_vvvvwcf);
+		var temp_vvvvwcg = has_defaults_vvvvwcg;
+		var has_defaults_vvvvwcg = [];
+		has_defaults_vvvvwcg.push(temp_vvvvwcg);
 	}
-	else if (!isSet(has_defaults_vvvvwcf))
+	else if (!isSet(has_defaults_vvvvwcg))
 	{
-		var has_defaults_vvvvwcf = [];
+		var has_defaults_vvvvwcg = [];
 	}
-	var has_defaults = has_defaults_vvvvwcf.some(has_defaults_vvvvwcf_SomeFunc);
+	var has_defaults = has_defaults_vvvvwcg.some(has_defaults_vvvvwcg_SomeFunc);
 
 
 	// set this function logic
@@ -171,129 +176,46 @@ function vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwcfvxq_required)
+		if (jform_vvvvwcgvxr_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_vvvvwcfvxq_required = false;
+			jform_vvvvwcgvxr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwcfvxq_required)
+		if (!jform_vvvvwcgvxr_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_vvvvwcfvxq_required = true;
+			jform_vvvvwcgvxr_required = true;
 		}
 	}
 }
 
-// the vvvvwcf Some function
-function datadefault_vvvvwcf_SomeFunc(datadefault_vvvvwcf)
+// the vvvvwcg Some function
+function datadefault_vvvvwcg_SomeFunc(datadefault_vvvvwcg)
 {
 	// set the function logic
-	if (datadefault_vvvvwcf == 'Other')
+	if (datadefault_vvvvwcg == 'Other')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcf Some function
-function has_defaults_vvvvwcf_SomeFunc(has_defaults_vvvvwcf)
+// the vvvvwcg Some function
+function has_defaults_vvvvwcg_SomeFunc(has_defaults_vvvvwcg)
 {
 	// set the function logic
-	if (has_defaults_vvvvwcf == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwch function
-function vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch)
-{
-	if (isSet(datatype_vvvvwch) && datatype_vvvvwch.constructor !== Array)
-	{
-		var temp_vvvvwch = datatype_vvvvwch;
-		var datatype_vvvvwch = [];
-		datatype_vvvvwch.push(temp_vvvvwch);
-	}
-	else if (!isSet(datatype_vvvvwch))
-	{
-		var datatype_vvvvwch = [];
-	}
-	var datatype = datatype_vvvvwch.some(datatype_vvvvwch_SomeFunc);
-
-	if (isSet(has_defaults_vvvvwch) && has_defaults_vvvvwch.constructor !== Array)
-	{
-		var temp_vvvvwch = has_defaults_vvvvwch;
-		var has_defaults_vvvvwch = [];
-		has_defaults_vvvvwch.push(temp_vvvvwch);
-	}
-	else if (!isSet(has_defaults_vvvvwch))
-	{
-		var has_defaults_vvvvwch = [];
-	}
-	var has_defaults = has_defaults_vvvvwch.some(has_defaults_vvvvwch_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_vvvvwchvxr_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwchvxr_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_vvvvwchvxr_required)
-		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwchvxr_required = true;
-		}
-	}
-}
-
-// the vvvvwch Some function
-function datatype_vvvvwch_SomeFunc(datatype_vvvvwch)
-{
-	// set the function logic
-	if (datatype_vvvvwch == 'CHAR' || datatype_vvvvwch == 'VARCHAR' || datatype_vvvvwch == 'DATETIME' || datatype_vvvvwch == 'DATE' || datatype_vvvvwch == 'TIME' || datatype_vvvvwch == 'INT' || datatype_vvvvwch == 'TINYINT' || datatype_vvvvwch == 'BIGINT' || datatype_vvvvwch == 'FLOAT' || datatype_vvvvwch == 'DECIMAL' || datatype_vvvvwch == 'DOUBLE')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwch Some function
-function has_defaults_vvvvwch_SomeFunc(has_defaults_vvvvwch)
-{
-	// set the function logic
-	if (has_defaults_vvvvwch == 1)
+	if (has_defaults_vvvvwcg == 1)
 	{
 		return true;
 	}
@@ -301,20 +223,8 @@ function has_defaults_vvvvwch_SomeFunc(has_defaults_vvvvwch)
 }
 
 // the vvvvwci function
-function vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci)
+function vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci)
 {
-	if (isSet(has_defaults_vvvvwci) && has_defaults_vvvvwci.constructor !== Array)
-	{
-		var temp_vvvvwci = has_defaults_vvvvwci;
-		var has_defaults_vvvvwci = [];
-		has_defaults_vvvvwci.push(temp_vvvvwci);
-	}
-	else if (!isSet(has_defaults_vvvvwci))
-	{
-		var has_defaults_vvvvwci = [];
-	}
-	var has_defaults = has_defaults_vvvvwci.some(has_defaults_vvvvwci_SomeFunc);
-
 	if (isSet(datatype_vvvvwci) && datatype_vvvvwci.constructor !== Array)
 	{
 		var temp_vvvvwci = datatype_vvvvwci;
@@ -327,40 +237,59 @@ function vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci)
 	}
 	var datatype = datatype_vvvvwci.some(datatype_vvvvwci_SomeFunc);
 
+	if (isSet(has_defaults_vvvvwci) && has_defaults_vvvvwci.constructor !== Array)
+	{
+		var temp_vvvvwci = has_defaults_vvvvwci;
+		var has_defaults_vvvvwci = [];
+		has_defaults_vvvvwci.push(temp_vvvvwci);
+	}
+	else if (!isSet(has_defaults_vvvvwci))
+	{
+		var has_defaults_vvvvwci = [];
+	}
+	var has_defaults = has_defaults_vvvvwci.some(has_defaults_vvvvwci_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();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		// add required attribute to indexes field
+		// add required attribute to datalenght field
 		if (jform_vvvvwcivxs_required)
 		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
+			updateFieldRequired('datalenght',0);
+			jQuery('#jform_datalenght').prop('required','required');
+			jQuery('#jform_datalenght').attr('aria-required',true);
+			jQuery('#jform_datalenght').addClass('required');
 			jform_vvvvwcivxs_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
+		// remove required attribute from datalenght field
 		if (!jform_vvvvwcivxs_required)
 		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			updateFieldRequired('datalenght',1);
+			jQuery('#jform_datalenght').removeAttr('required');
+			jQuery('#jform_datalenght').removeAttr('aria-required');
+			jQuery('#jform_datalenght').removeClass('required');
 			jform_vvvvwcivxs_required = true;
 		}
 	}
 }
 
+// the vvvvwci Some function
+function datatype_vvvvwci_SomeFunc(datatype_vvvvwci)
+{
+	// set the function logic
+	if (datatype_vvvvwci == 'CHAR' || datatype_vvvvwci == 'VARCHAR' || datatype_vvvvwci == 'INT' || datatype_vvvvwci == 'TINYINT' || datatype_vvvvwci == 'BIGINT' || datatype_vvvvwci == 'FLOAT' || datatype_vvvvwci == 'DECIMAL' || datatype_vvvvwci == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
 // the vvvvwci Some function
 function has_defaults_vvvvwci_SomeFunc(has_defaults_vvvvwci)
 {
@@ -372,90 +301,81 @@ function has_defaults_vvvvwci_SomeFunc(has_defaults_vvvvwci)
 	return false;
 }
 
-// the vvvvwci Some function
-function datatype_vvvvwci_SomeFunc(datatype_vvvvwci)
+// the vvvvwck function
+function vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck)
 {
-	// set the function logic
-	if (datatype_vvvvwci == 'CHAR' || datatype_vvvvwci == 'VARCHAR' || datatype_vvvvwci == 'DATETIME' || datatype_vvvvwci == 'DATE' || datatype_vvvvwci == 'TIME' || datatype_vvvvwci == 'INT' || datatype_vvvvwci == 'TINYINT' || datatype_vvvvwci == 'BIGINT' || datatype_vvvvwci == 'FLOAT' || datatype_vvvvwci == 'DECIMAL' || datatype_vvvvwci == 'DOUBLE')
+	if (isSet(datatype_vvvvwck) && datatype_vvvvwck.constructor !== Array)
 	{
-		return true;
+		var temp_vvvvwck = datatype_vvvvwck;
+		var datatype_vvvvwck = [];
+		datatype_vvvvwck.push(temp_vvvvwck);
 	}
-	return false;
-}
+	else if (!isSet(datatype_vvvvwck))
+	{
+		var datatype_vvvvwck = [];
+	}
+	var datatype = datatype_vvvvwck.some(datatype_vvvvwck_SomeFunc);
 
-// the vvvvwcj function
-function vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj)
-{
-	if (isSet(datatype_vvvvwcj) && datatype_vvvvwcj.constructor !== Array)
+	if (isSet(has_defaults_vvvvwck) && has_defaults_vvvvwck.constructor !== Array)
 	{
-		var temp_vvvvwcj = datatype_vvvvwcj;
-		var datatype_vvvvwcj = [];
-		datatype_vvvvwcj.push(temp_vvvvwcj);
+		var temp_vvvvwck = has_defaults_vvvvwck;
+		var has_defaults_vvvvwck = [];
+		has_defaults_vvvvwck.push(temp_vvvvwck);
 	}
-	else if (!isSet(datatype_vvvvwcj))
+	else if (!isSet(has_defaults_vvvvwck))
 	{
-		var datatype_vvvvwcj = [];
+		var has_defaults_vvvvwck = [];
 	}
-	var datatype = datatype_vvvvwcj.some(datatype_vvvvwcj_SomeFunc);
-
-	if (isSet(has_defaults_vvvvwcj) && has_defaults_vvvvwcj.constructor !== Array)
-	{
-		var temp_vvvvwcj = has_defaults_vvvvwcj;
-		var has_defaults_vvvvwcj = [];
-		has_defaults_vvvvwcj.push(temp_vvvvwcj);
-	}
-	else if (!isSet(has_defaults_vvvvwcj))
-	{
-		var has_defaults_vvvvwcj = [];
-	}
-	var has_defaults = has_defaults_vvvvwcj.some(has_defaults_vvvvwcj_SomeFunc);
+	var has_defaults = has_defaults_vvvvwck.some(has_defaults_vvvvwck_SomeFunc);
 
 
 	// set this function logic
 	if (datatype && has_defaults)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
-		// add required attribute to store field
-		if (jform_vvvvwcjvxt_required)
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
+		if (jform_vvvvwckvxt_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
-			jform_vvvvwcjvxt_required = false;
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwckvxt_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
-		// remove required attribute from store field
-		if (!jform_vvvvwcjvxt_required)
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
+		if (!jform_vvvvwckvxt_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwcjvxt_required = true;
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwckvxt_required = true;
 		}
 	}
 }
 
-// the vvvvwcj Some function
-function datatype_vvvvwcj_SomeFunc(datatype_vvvvwcj)
+// the vvvvwck Some function
+function datatype_vvvvwck_SomeFunc(datatype_vvvvwck)
 {
 	// set the function logic
-	if (datatype_vvvvwcj == 'CHAR' || datatype_vvvvwcj == 'VARCHAR' || datatype_vvvvwcj == 'TEXT' || datatype_vvvvwcj == 'MEDIUMTEXT' || datatype_vvvvwcj == 'LONGTEXT' || datatype_vvvvwcj == 'BLOB' || datatype_vvvvwcj == 'TINYBLOB' || datatype_vvvvwcj == 'MEDIUMBLOB' || datatype_vvvvwcj == 'LONGBLOB')
+	if (datatype_vvvvwck == 'CHAR' || datatype_vvvvwck == 'VARCHAR' || datatype_vvvvwck == 'DATETIME' || datatype_vvvvwck == 'DATE' || datatype_vvvvwck == 'TIME' || datatype_vvvvwck == 'INT' || datatype_vvvvwck == 'TINYINT' || datatype_vvvvwck == 'BIGINT' || datatype_vvvvwck == 'FLOAT' || datatype_vvvvwck == 'DECIMAL' || datatype_vvvvwck == 'DOUBLE')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcj Some function
-function has_defaults_vvvvwcj_SomeFunc(has_defaults_vvvvwcj)
+// the vvvvwck Some function
+function has_defaults_vvvvwck_SomeFunc(has_defaults_vvvvwck)
 {
 	// set the function logic
-	if (has_defaults_vvvvwcj == 1)
+	if (has_defaults_vvvvwck == 1)
 	{
 		return true;
 	}
@@ -463,19 +383,19 @@ function has_defaults_vvvvwcj_SomeFunc(has_defaults_vvvvwcj)
 }
 
 // the vvvvwcl function
-function vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl)
+function vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl)
 {
-	if (isSet(store_vvvvwcl) && store_vvvvwcl.constructor !== Array)
+	if (isSet(has_defaults_vvvvwcl) && has_defaults_vvvvwcl.constructor !== Array)
 	{
-		var temp_vvvvwcl = store_vvvvwcl;
-		var store_vvvvwcl = [];
-		store_vvvvwcl.push(temp_vvvvwcl);
+		var temp_vvvvwcl = has_defaults_vvvvwcl;
+		var has_defaults_vvvvwcl = [];
+		has_defaults_vvvvwcl.push(temp_vvvvwcl);
 	}
-	else if (!isSet(store_vvvvwcl))
+	else if (!isSet(has_defaults_vvvvwcl))
 	{
-		var store_vvvvwcl = [];
+		var has_defaults_vvvvwcl = [];
 	}
-	var store = store_vvvvwcl.some(store_vvvvwcl_SomeFunc);
+	var has_defaults = has_defaults_vvvvwcl.some(has_defaults_vvvvwcl_SomeFunc);
 
 	if (isSet(datatype_vvvvwcl) && datatype_vvvvwcl.constructor !== Array)
 	{
@@ -489,52 +409,38 @@ function vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl)
 	}
 	var datatype = datatype_vvvvwcl.some(datatype_vvvvwcl_SomeFunc);
 
-	if (isSet(has_defaults_vvvvwcl) && has_defaults_vvvvwcl.constructor !== Array)
-	{
-		var temp_vvvvwcl = has_defaults_vvvvwcl;
-		var has_defaults_vvvvwcl = [];
-		has_defaults_vvvvwcl.push(temp_vvvvwcl);
-	}
-	else if (!isSet(has_defaults_vvvvwcl))
-	{
-		var has_defaults_vvvvwcl = [];
-	}
-	var has_defaults = has_defaults_vvvvwcl.some(has_defaults_vvvvwcl_SomeFunc);
-
 
 	// set this function logic
-	if (store && datatype && has_defaults)
+	if (has_defaults && datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		// add required attribute to indexes field
+		if (jform_vvvvwclvxu_required)
+		{
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwclvxu_required = false;
+		}
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		// remove required attribute from indexes field
+		if (!jform_vvvvwclvxu_required)
+		{
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwclvxu_required = true;
+		}
 	}
 }
 
-// the vvvvwcl Some function
-function store_vvvvwcl_SomeFunc(store_vvvvwcl)
-{
-	// set the function logic
-	if (store_vvvvwcl == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwcl Some function
-function datatype_vvvvwcl_SomeFunc(datatype_vvvvwcl)
-{
-	// set the function logic
-	if (datatype_vvvvwcl == 'CHAR' || datatype_vvvvwcl == 'VARCHAR' || datatype_vvvvwcl == 'TEXT' || datatype_vvvvwcl == 'MEDIUMTEXT' || datatype_vvvvwcl == 'LONGTEXT' || datatype_vvvvwcl == 'BLOB' || datatype_vvvvwcl == 'TINYBLOB' || datatype_vvvvwcl == 'MEDIUMBLOB' || datatype_vvvvwcl == 'LONGBLOB')
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwcl Some function
 function has_defaults_vvvvwcl_SomeFunc(has_defaults_vvvvwcl)
 {
@@ -546,8 +452,19 @@ function has_defaults_vvvvwcl_SomeFunc(has_defaults_vvvvwcl)
 	return false;
 }
 
+// the vvvvwcl Some function
+function datatype_vvvvwcl_SomeFunc(datatype_vvvvwcl)
+{
+	// set the function logic
+	if (datatype_vvvvwcl == 'CHAR' || datatype_vvvvwcl == 'VARCHAR' || datatype_vvvvwcl == 'DATETIME' || datatype_vvvvwcl == 'DATE' || datatype_vvvvwcl == 'TIME' || datatype_vvvvwcl == 'INT' || datatype_vvvvwcl == 'TINYINT' || datatype_vvvvwcl == 'BIGINT' || datatype_vvvvwcl == 'FLOAT' || datatype_vvvvwcl == 'DECIMAL' || datatype_vvvvwcl == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
 // the vvvvwcm function
-function vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm)
+function vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm)
 {
 	if (isSet(datatype_vvvvwcm) && datatype_vvvvwcm.constructor !== Array)
 	{
@@ -561,18 +478,6 @@ function vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm)
 	}
 	var datatype = datatype_vvvvwcm.some(datatype_vvvvwcm_SomeFunc);
 
-	if (isSet(store_vvvvwcm) && store_vvvvwcm.constructor !== Array)
-	{
-		var temp_vvvvwcm = store_vvvvwcm;
-		var store_vvvvwcm = [];
-		store_vvvvwcm.push(temp_vvvvwcm);
-	}
-	else if (!isSet(store_vvvvwcm))
-	{
-		var store_vvvvwcm = [];
-	}
-	var store = store_vvvvwcm.some(store_vvvvwcm_SomeFunc);
-
 	if (isSet(has_defaults_vvvvwcm) && has_defaults_vvvvwcm.constructor !== Array)
 	{
 		var temp_vvvvwcm = has_defaults_vvvvwcm;
@@ -587,13 +492,31 @@ function vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm)
 
 
 	// set this function logic
-	if (datatype && store && 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_vvvvwcmvxv_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwcmvxv_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_vvvvwcmvxv_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwcmvxv_required = true;
+		}
 	}
 }
 
@@ -608,17 +531,6 @@ function datatype_vvvvwcm_SomeFunc(datatype_vvvvwcm)
 	return false;
 }
 
-// the vvvvwcm Some function
-function store_vvvvwcm_SomeFunc(store_vvvvwcm)
-{
-	// set the function logic
-	if (store_vvvvwcm == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwcm Some function
 function has_defaults_vvvvwcm_SomeFunc(has_defaults_vvvvwcm)
 {
@@ -630,44 +542,212 @@ function has_defaults_vvvvwcm_SomeFunc(has_defaults_vvvvwcm)
 	return false;
 }
 
-// the vvvvwcn function
-function vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn)
+// the vvvvwco function
+function vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco)
 {
-	if (isSet(has_defaults_vvvvwcn) && has_defaults_vvvvwcn.constructor !== Array)
+	if (isSet(store_vvvvwco) && store_vvvvwco.constructor !== Array)
 	{
-		var temp_vvvvwcn = has_defaults_vvvvwcn;
-		var has_defaults_vvvvwcn = [];
-		has_defaults_vvvvwcn.push(temp_vvvvwcn);
+		var temp_vvvvwco = store_vvvvwco;
+		var store_vvvvwco = [];
+		store_vvvvwco.push(temp_vvvvwco);
 	}
-	else if (!isSet(has_defaults_vvvvwcn))
+	else if (!isSet(store_vvvvwco))
 	{
-		var has_defaults_vvvvwcn = [];
+		var store_vvvvwco = [];
 	}
-	var has_defaults = has_defaults_vvvvwcn.some(has_defaults_vvvvwcn_SomeFunc);
+	var store = store_vvvvwco.some(store_vvvvwco_SomeFunc);
 
-	if (isSet(store_vvvvwcn) && store_vvvvwcn.constructor !== Array)
+	if (isSet(datatype_vvvvwco) && datatype_vvvvwco.constructor !== Array)
 	{
-		var temp_vvvvwcn = store_vvvvwcn;
-		var store_vvvvwcn = [];
-		store_vvvvwcn.push(temp_vvvvwcn);
+		var temp_vvvvwco = datatype_vvvvwco;
+		var datatype_vvvvwco = [];
+		datatype_vvvvwco.push(temp_vvvvwco);
 	}
-	else if (!isSet(store_vvvvwcn))
+	else if (!isSet(datatype_vvvvwco))
 	{
-		var store_vvvvwcn = [];
+		var datatype_vvvvwco = [];
 	}
-	var store = store_vvvvwcn.some(store_vvvvwcn_SomeFunc);
+	var datatype = datatype_vvvvwco.some(datatype_vvvvwco_SomeFunc);
 
-	if (isSet(datatype_vvvvwcn) && datatype_vvvvwcn.constructor !== Array)
+	if (isSet(has_defaults_vvvvwco) && has_defaults_vvvvwco.constructor !== Array)
 	{
-		var temp_vvvvwcn = datatype_vvvvwcn;
-		var datatype_vvvvwcn = [];
-		datatype_vvvvwcn.push(temp_vvvvwcn);
+		var temp_vvvvwco = has_defaults_vvvvwco;
+		var has_defaults_vvvvwco = [];
+		has_defaults_vvvvwco.push(temp_vvvvwco);
 	}
-	else if (!isSet(datatype_vvvvwcn))
+	else if (!isSet(has_defaults_vvvvwco))
 	{
-		var datatype_vvvvwcn = [];
+		var has_defaults_vvvvwco = [];
 	}
-	var datatype = datatype_vvvvwcn.some(datatype_vvvvwcn_SomeFunc);
+	var has_defaults = has_defaults_vvvvwco.some(has_defaults_vvvvwco_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype && has_defaults)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwco Some function
+function store_vvvvwco_SomeFunc(store_vvvvwco)
+{
+	// set the function logic
+	if (store_vvvvwco == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwco Some function
+function datatype_vvvvwco_SomeFunc(datatype_vvvvwco)
+{
+	// set the function logic
+	if (datatype_vvvvwco == 'CHAR' || datatype_vvvvwco == 'VARCHAR' || datatype_vvvvwco == 'TEXT' || datatype_vvvvwco == 'MEDIUMTEXT' || datatype_vvvvwco == 'LONGTEXT' || datatype_vvvvwco == 'BLOB' || datatype_vvvvwco == 'TINYBLOB' || datatype_vvvvwco == 'MEDIUMBLOB' || datatype_vvvvwco == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwco Some function
+function has_defaults_vvvvwco_SomeFunc(has_defaults_vvvvwco)
+{
+	// set the function logic
+	if (has_defaults_vvvvwco == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcp function
+function vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp)
+{
+	if (isSet(datatype_vvvvwcp) && datatype_vvvvwcp.constructor !== Array)
+	{
+		var temp_vvvvwcp = datatype_vvvvwcp;
+		var datatype_vvvvwcp = [];
+		datatype_vvvvwcp.push(temp_vvvvwcp);
+	}
+	else if (!isSet(datatype_vvvvwcp))
+	{
+		var datatype_vvvvwcp = [];
+	}
+	var datatype = datatype_vvvvwcp.some(datatype_vvvvwcp_SomeFunc);
+
+	if (isSet(store_vvvvwcp) && store_vvvvwcp.constructor !== Array)
+	{
+		var temp_vvvvwcp = store_vvvvwcp;
+		var store_vvvvwcp = [];
+		store_vvvvwcp.push(temp_vvvvwcp);
+	}
+	else if (!isSet(store_vvvvwcp))
+	{
+		var store_vvvvwcp = [];
+	}
+	var store = store_vvvvwcp.some(store_vvvvwcp_SomeFunc);
+
+	if (isSet(has_defaults_vvvvwcp) && has_defaults_vvvvwcp.constructor !== Array)
+	{
+		var temp_vvvvwcp = has_defaults_vvvvwcp;
+		var has_defaults_vvvvwcp = [];
+		has_defaults_vvvvwcp.push(temp_vvvvwcp);
+	}
+	else if (!isSet(has_defaults_vvvvwcp))
+	{
+		var has_defaults_vvvvwcp = [];
+	}
+	var has_defaults = has_defaults_vvvvwcp.some(has_defaults_vvvvwcp_SomeFunc);
+
+
+	// set this function logic
+	if (datatype && store && has_defaults)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwcp Some function
+function datatype_vvvvwcp_SomeFunc(datatype_vvvvwcp)
+{
+	// set the function logic
+	if (datatype_vvvvwcp == 'CHAR' || datatype_vvvvwcp == 'VARCHAR' || datatype_vvvvwcp == 'TEXT' || datatype_vvvvwcp == 'MEDIUMTEXT' || datatype_vvvvwcp == 'LONGTEXT' || datatype_vvvvwcp == 'BLOB' || datatype_vvvvwcp == 'TINYBLOB' || datatype_vvvvwcp == 'MEDIUMBLOB' || datatype_vvvvwcp == 'LONGBLOB')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcp Some function
+function store_vvvvwcp_SomeFunc(store_vvvvwcp)
+{
+	// set the function logic
+	if (store_vvvvwcp == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcp Some function
+function has_defaults_vvvvwcp_SomeFunc(has_defaults_vvvvwcp)
+{
+	// set the function logic
+	if (has_defaults_vvvvwcp == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcq function
+function vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq)
+{
+	if (isSet(has_defaults_vvvvwcq) && has_defaults_vvvvwcq.constructor !== Array)
+	{
+		var temp_vvvvwcq = has_defaults_vvvvwcq;
+		var has_defaults_vvvvwcq = [];
+		has_defaults_vvvvwcq.push(temp_vvvvwcq);
+	}
+	else if (!isSet(has_defaults_vvvvwcq))
+	{
+		var has_defaults_vvvvwcq = [];
+	}
+	var has_defaults = has_defaults_vvvvwcq.some(has_defaults_vvvvwcq_SomeFunc);
+
+	if (isSet(store_vvvvwcq) && store_vvvvwcq.constructor !== Array)
+	{
+		var temp_vvvvwcq = store_vvvvwcq;
+		var store_vvvvwcq = [];
+		store_vvvvwcq.push(temp_vvvvwcq);
+	}
+	else if (!isSet(store_vvvvwcq))
+	{
+		var store_vvvvwcq = [];
+	}
+	var store = store_vvvvwcq.some(store_vvvvwcq_SomeFunc);
+
+	if (isSet(datatype_vvvvwcq) && datatype_vvvvwcq.constructor !== Array)
+	{
+		var temp_vvvvwcq = datatype_vvvvwcq;
+		var datatype_vvvvwcq = [];
+		datatype_vvvvwcq.push(temp_vvvvwcq);
+	}
+	else if (!isSet(datatype_vvvvwcq))
+	{
+		var datatype_vvvvwcq = [];
+	}
+	var datatype = datatype_vvvvwcq.some(datatype_vvvvwcq_SomeFunc);
 
 
 	// set this function logic
@@ -681,87 +761,87 @@ function vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn)
 	}
 }
 
-// the vvvvwcn Some function
-function has_defaults_vvvvwcn_SomeFunc(has_defaults_vvvvwcn)
+// the vvvvwcq Some function
+function has_defaults_vvvvwcq_SomeFunc(has_defaults_vvvvwcq)
 {
 	// set the function logic
-	if (has_defaults_vvvvwcn == 1)
+	if (has_defaults_vvvvwcq == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcn Some function
-function store_vvvvwcn_SomeFunc(store_vvvvwcn)
+// the vvvvwcq Some function
+function store_vvvvwcq_SomeFunc(store_vvvvwcq)
 {
 	// set the function logic
-	if (store_vvvvwcn == 4)
+	if (store_vvvvwcq == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcn Some function
-function datatype_vvvvwcn_SomeFunc(datatype_vvvvwcn)
+// the vvvvwcq Some function
+function datatype_vvvvwcq_SomeFunc(datatype_vvvvwcq)
 {
 	// set the function logic
-	if (datatype_vvvvwcn == 'CHAR' || datatype_vvvvwcn == 'VARCHAR' || datatype_vvvvwcn == 'TEXT' || datatype_vvvvwcn == 'MEDIUMTEXT' || datatype_vvvvwcn == 'LONGTEXT' || datatype_vvvvwcn == 'BLOB' || datatype_vvvvwcn == 'TINYBLOB' || datatype_vvvvwcn == 'MEDIUMBLOB' || datatype_vvvvwcn == 'LONGBLOB')
+	if (datatype_vvvvwcq == 'CHAR' || datatype_vvvvwcq == 'VARCHAR' || datatype_vvvvwcq == 'TEXT' || datatype_vvvvwcq == 'MEDIUMTEXT' || datatype_vvvvwcq == 'LONGTEXT' || datatype_vvvvwcq == 'BLOB' || datatype_vvvvwcq == 'TINYBLOB' || datatype_vvvvwcq == 'MEDIUMBLOB' || datatype_vvvvwcq == 'LONGBLOB')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwco function
-function vvvvwco(has_defaults_vvvvwco)
+// the vvvvwcr function
+function vvvvwcr(has_defaults_vvvvwcr)
 {
 	// set the function logic
-	if (has_defaults_vvvvwco == 1)
+	if (has_defaults_vvvvwcr == 1)
 	{
 		jQuery('#jform_datatype').closest('.control-group').show();
 		// add required attribute to datatype field
-		if (jform_vvvvwcovxu_required)
+		if (jform_vvvvwcrvxw_required)
 		{
 			updateFieldRequired('datatype',0);
 			jQuery('#jform_datatype').prop('required','required');
 			jQuery('#jform_datatype').attr('aria-required',true);
 			jQuery('#jform_datatype').addClass('required');
-			jform_vvvvwcovxu_required = false;
+			jform_vvvvwcrvxw_required = false;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').show();
 		// add required attribute to null_switch field
-		if (jform_vvvvwcovxv_required)
+		if (jform_vvvvwcrvxx_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_vvvvwcovxv_required = false;
+			jform_vvvvwcrvxx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datatype').closest('.control-group').hide();
 		// remove required attribute from datatype field
-		if (!jform_vvvvwcovxu_required)
+		if (!jform_vvvvwcrvxw_required)
 		{
 			updateFieldRequired('datatype',1);
 			jQuery('#jform_datatype').removeAttr('required');
 			jQuery('#jform_datatype').removeAttr('aria-required');
 			jQuery('#jform_datatype').removeClass('required');
-			jform_vvvvwcovxu_required = true;
+			jform_vvvvwcrvxw_required = true;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').hide();
 		// remove required attribute from null_switch field
-		if (!jform_vvvvwcovxv_required)
+		if (!jform_vvvvwcrvxx_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_vvvvwcovxv_required = true;
+			jform_vvvvwcrvxx_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/fieldtype.xml b/admin/models/forms/fieldtype.xml
index d29eef73b..516fa0319 100644
--- a/admin/models/forms/fieldtype.xml
+++ b/admin/models/forms/fieldtype.xml
@@ -181,10 +181,8 @@
 			maxlength="50"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_DESCRIPTION"
 			class="text_area"
-			readonly="false"
-			disabled="false"
 			required="true"
-			filter="STRING"
+			filter="INT"
 			message="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_OTHER_HINT"
 		/>
@@ -196,6 +194,7 @@
 			description="COM_COMPONENTBUILDER_FIELDTYPE_DATALENGHT_DESCRIPTION"
 			class="btn-group"
 			multiple="false"
+			required="true"
 			default="">
 			<!-- Option Set. -->
 			<option value="">
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 399b56d1e..715bdebe8 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -9,112 +9,112 @@
  */
 
 // Some Global Values
-jform_vvvvwczvyh_required = false;
-jform_vvvvwdavyi_required = false;
-jform_vvvvwdbvyj_required = false;
-jform_vvvvwdcvyk_required = false;
+jform_vvvvwdcvyj_required = false;
+jform_vvvvwddvyk_required = false;
 jform_vvvvwdevyl_required = false;
+jform_vvvvwdfvym_required = false;
+jform_vvvvwdhvyn_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwcz = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcz(location_vvvvwcz);
+	var location_vvvvwdc = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdc(location_vvvvwdc);
 
-	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(location_vvvvwda);
+	var location_vvvvwdd = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdd(location_vvvvwdd);
 
-	var type_vvvvwdb = jQuery("#jform_type").val();
-	vvvvwdb(type_vvvvwdb);
+	var type_vvvvwde = jQuery("#jform_type").val();
+	vvvvwde(type_vvvvwde);
 
-	var type_vvvvwdc = jQuery("#jform_type").val();
-	vvvvwdc(type_vvvvwdc);
+	var type_vvvvwdf = jQuery("#jform_type").val();
+	vvvvwdf(type_vvvvwdf);
 
-	var type_vvvvwdd = jQuery("#jform_type").val();
-	vvvvwdd(type_vvvvwdd);
+	var type_vvvvwdg = jQuery("#jform_type").val();
+	vvvvwdg(type_vvvvwdg);
 
-	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwde(target_vvvvwde);
+	var target_vvvvwdh = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwdh(target_vvvvwdh);
 });
 
-// the vvvvwcz function
-function vvvvwcz(location_vvvvwcz)
+// the vvvvwdc function
+function vvvvwdc(location_vvvvwdc)
 {
 	// set the function logic
-	if (location_vvvvwcz == 1)
+	if (location_vvvvwdc == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwczvyh_required)
+		if (jform_vvvvwdcvyj_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_vvvvwczvyh_required = false;
+			jform_vvvvwdcvyj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwczvyh_required)
+		if (!jform_vvvvwdcvyj_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_vvvvwczvyh_required = true;
+			jform_vvvvwdcvyj_required = true;
 		}
 	}
 }
 
-// the vvvvwda function
-function vvvvwda(location_vvvvwda)
+// the vvvvwdd function
+function vvvvwdd(location_vvvvwdd)
 {
 	// set the function logic
-	if (location_vvvvwda == 2)
+	if (location_vvvvwdd == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwdavyi_required)
+		if (jform_vvvvwddvyk_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_vvvvwdavyi_required = false;
+			jform_vvvvwddvyk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwdavyi_required)
+		if (!jform_vvvvwddvyk_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_vvvvwdavyi_required = true;
+			jform_vvvvwddvyk_required = true;
 		}
 	}
 }
 
-// the vvvvwdb function
-function vvvvwdb(type_vvvvwdb)
+// the vvvvwde function
+function vvvvwde(type_vvvvwde)
 {
-	if (isSet(type_vvvvwdb) && type_vvvvwdb.constructor !== Array)
+	if (isSet(type_vvvvwde) && type_vvvvwde.constructor !== Array)
 	{
-		var temp_vvvvwdb = type_vvvvwdb;
-		var type_vvvvwdb = [];
-		type_vvvvwdb.push(temp_vvvvwdb);
+		var temp_vvvvwde = type_vvvvwde;
+		var type_vvvvwde = [];
+		type_vvvvwde.push(temp_vvvvwde);
 	}
-	else if (!isSet(type_vvvvwdb))
+	else if (!isSet(type_vvvvwde))
 	{
-		var type_vvvvwdb = [];
+		var type_vvvvwde = [];
 	}
-	var type = type_vvvvwdb.some(type_vvvvwdb_SomeFunc);
+	var type = type_vvvvwde.some(type_vvvvwde_SomeFunc);
 
 
 	// set this function logic
@@ -122,55 +122,55 @@ function vvvvwdb(type_vvvvwdb)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
 		// add required attribute to url field
-		if (jform_vvvvwdbvyj_required)
+		if (jform_vvvvwdevyl_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwdbvyj_required = false;
+			jform_vvvvwdevyl_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
 		// remove required attribute from url field
-		if (!jform_vvvvwdbvyj_required)
+		if (!jform_vvvvwdevyl_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwdbvyj_required = true;
+			jform_vvvvwdevyl_required = true;
 		}
 	}
 }
 
-// the vvvvwdb Some function
-function type_vvvvwdb_SomeFunc(type_vvvvwdb)
+// the vvvvwde Some function
+function type_vvvvwde_SomeFunc(type_vvvvwde)
 {
 	// set the function logic
-	if (type_vvvvwdb == 3)
+	if (type_vvvvwde == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdc function
-function vvvvwdc(type_vvvvwdc)
+// the vvvvwdf function
+function vvvvwdf(type_vvvvwdf)
 {
-	if (isSet(type_vvvvwdc) && type_vvvvwdc.constructor !== Array)
+	if (isSet(type_vvvvwdf) && type_vvvvwdf.constructor !== Array)
 	{
-		var temp_vvvvwdc = type_vvvvwdc;
-		var type_vvvvwdc = [];
-		type_vvvvwdc.push(temp_vvvvwdc);
+		var temp_vvvvwdf = type_vvvvwdf;
+		var type_vvvvwdf = [];
+		type_vvvvwdf.push(temp_vvvvwdf);
 	}
-	else if (!isSet(type_vvvvwdc))
+	else if (!isSet(type_vvvvwdf))
 	{
-		var type_vvvvwdc = [];
+		var type_vvvvwdf = [];
 	}
-	var type = type_vvvvwdc.some(type_vvvvwdc_SomeFunc);
+	var type = type_vvvvwdf.some(type_vvvvwdf_SomeFunc);
 
 
 	// set this function logic
@@ -178,55 +178,55 @@ function vvvvwdc(type_vvvvwdc)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
 		// add required attribute to article field
-		if (jform_vvvvwdcvyk_required)
+		if (jform_vvvvwdfvym_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwdcvyk_required = false;
+			jform_vvvvwdfvym_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
 		// remove required attribute from article field
-		if (!jform_vvvvwdcvyk_required)
+		if (!jform_vvvvwdfvym_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwdcvyk_required = true;
+			jform_vvvvwdfvym_required = true;
 		}
 	}
 }
 
-// the vvvvwdc Some function
-function type_vvvvwdc_SomeFunc(type_vvvvwdc)
+// the vvvvwdf Some function
+function type_vvvvwdf_SomeFunc(type_vvvvwdf)
 {
 	// set the function logic
-	if (type_vvvvwdc == 1)
+	if (type_vvvvwdf == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwdd function
-function vvvvwdd(type_vvvvwdd)
+// the vvvvwdg function
+function vvvvwdg(type_vvvvwdg)
 {
-	if (isSet(type_vvvvwdd) && type_vvvvwdd.constructor !== Array)
+	if (isSet(type_vvvvwdg) && type_vvvvwdg.constructor !== Array)
 	{
-		var temp_vvvvwdd = type_vvvvwdd;
-		var type_vvvvwdd = [];
-		type_vvvvwdd.push(temp_vvvvwdd);
+		var temp_vvvvwdg = type_vvvvwdg;
+		var type_vvvvwdg = [];
+		type_vvvvwdg.push(temp_vvvvwdg);
 	}
-	else if (!isSet(type_vvvvwdd))
+	else if (!isSet(type_vvvvwdg))
 	{
-		var type_vvvvwdd = [];
+		var type_vvvvwdg = [];
 	}
-	var type = type_vvvvwdd.some(type_vvvvwdd_SomeFunc);
+	var type = type_vvvvwdg.some(type_vvvvwdg_SomeFunc);
 
 
 	// set this function logic
@@ -240,45 +240,45 @@ function vvvvwdd(type_vvvvwdd)
 	}
 }
 
-// the vvvvwdd Some function
-function type_vvvvwdd_SomeFunc(type_vvvvwdd)
+// the vvvvwdg Some function
+function type_vvvvwdg_SomeFunc(type_vvvvwdg)
 {
 	// set the function logic
-	if (type_vvvvwdd == 2)
+	if (type_vvvvwdg == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwde function
-function vvvvwde(target_vvvvwde)
+// the vvvvwdh function
+function vvvvwdh(target_vvvvwdh)
 {
 	// set the function logic
-	if (target_vvvvwde == 1)
+	if (target_vvvvwdh == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwdevyl_required)
+		if (jform_vvvvwdhvyn_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwdevyl_required = false;
+			jform_vvvvwdhvyn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwdevyl_required)
+		if (!jform_vvvvwdhvyn_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwdevyl_required = true;
+			jform_vvvvwdhvyn_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/server.js b/admin/models/forms/server.js
index 8eb578083..926b9724d 100644
--- a/admin/models/forms/server.js
+++ b/admin/models/forms/server.js
@@ -9,56 +9,56 @@
  */
 
 // Some Global Values
-jform_vvvvwcpvxx_required = false;
-jform_vvvvwcpvxy_required = false;
-jform_vvvvwcpvxz_required = false;
-jform_vvvvwcpvya_required = false;
-jform_vvvvwcpvyb_required = false;
-jform_vvvvwcqvyc_required = false;
-jform_vvvvwcrvyd_required = false;
+jform_vvvvwcsvxz_required = false;
+jform_vvvvwcsvya_required = false;
+jform_vvvvwcsvyb_required = false;
+jform_vvvvwcsvyc_required = false;
+jform_vvvvwcsvyd_required = false;
 jform_vvvvwctvye_required = false;
-jform_vvvvwcvvyf_required = false;
+jform_vvvvwcuvyf_required = false;
+jform_vvvvwcwvyg_required = false;
+jform_vvvvwcyvyh_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwcp = jQuery("#jform_protocol").val();
-	vvvvwcp(protocol_vvvvwcp);
-
-	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	vvvvwcq(protocol_vvvvwcq);
-
-	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
+	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	vvvvwcs(protocol_vvvvwcs);
 
 	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
+	vvvvwct(protocol_vvvvwct);
 
-	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
 
-	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
-	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+
+	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+
+	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
 });
 
-// the vvvvwcp function
-function vvvvwcp(protocol_vvvvwcp)
+// the vvvvwcs function
+function vvvvwcs(protocol_vvvvwcs)
 {
-	if (isSet(protocol_vvvvwcp) && protocol_vvvvwcp.constructor !== Array)
+	if (isSet(protocol_vvvvwcs) && protocol_vvvvwcs.constructor !== Array)
 	{
-		var temp_vvvvwcp = protocol_vvvvwcp;
-		var protocol_vvvvwcp = [];
-		protocol_vvvvwcp.push(temp_vvvvwcp);
+		var temp_vvvvwcs = protocol_vvvvwcs;
+		var protocol_vvvvwcs = [];
+		protocol_vvvvwcs.push(temp_vvvvwcs);
 	}
-	else if (!isSet(protocol_vvvvwcp))
+	else if (!isSet(protocol_vvvvwcs))
 	{
-		var protocol_vvvvwcp = [];
+		var protocol_vvvvwcs = [];
 	}
-	var protocol = protocol_vvvvwcp.some(protocol_vvvvwcp_SomeFunc);
+	var protocol = protocol_vvvvwcs.some(protocol_vvvvwcs_SomeFunc);
 
 
 	// set this function logic
@@ -66,254 +66,117 @@ function vvvvwcp(protocol_vvvvwcp)
 	{
 		jQuery('#jform_authentication').closest('.control-group').show();
 		// add required attribute to authentication field
-		if (jform_vvvvwcpvxx_required)
+		if (jform_vvvvwcsvxz_required)
 		{
 			updateFieldRequired('authentication',0);
 			jQuery('#jform_authentication').prop('required','required');
 			jQuery('#jform_authentication').attr('aria-required',true);
 			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwcpvxx_required = false;
+			jform_vvvvwcsvxz_required = false;
 		}
 		jQuery('#jform_host').closest('.control-group').show();
 		// add required attribute to host field
-		if (jform_vvvvwcpvxy_required)
+		if (jform_vvvvwcsvya_required)
 		{
 			updateFieldRequired('host',0);
 			jQuery('#jform_host').prop('required','required');
 			jQuery('#jform_host').attr('aria-required',true);
 			jQuery('#jform_host').addClass('required');
-			jform_vvvvwcpvxy_required = false;
+			jform_vvvvwcsvya_required = false;
 		}
 		jQuery('#jform_port').closest('.control-group').show();
 		// add required attribute to port field
-		if (jform_vvvvwcpvxz_required)
+		if (jform_vvvvwcsvyb_required)
 		{
 			updateFieldRequired('port',0);
 			jQuery('#jform_port').prop('required','required');
 			jQuery('#jform_port').attr('aria-required',true);
 			jQuery('#jform_port').addClass('required');
-			jform_vvvvwcpvxz_required = false;
+			jform_vvvvwcsvyb_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwcpvya_required)
+		if (jform_vvvvwcsvyc_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwcpvya_required = false;
+			jform_vvvvwcsvyc_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_vvvvwcpvyb_required)
+		if (jform_vvvvwcsvyd_required)
 		{
 			updateFieldRequired('username',0);
 			jQuery('#jform_username').prop('required','required');
 			jQuery('#jform_username').attr('aria-required',true);
 			jQuery('#jform_username').addClass('required');
-			jform_vvvvwcpvyb_required = false;
+			jform_vvvvwcsvyd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_authentication').closest('.control-group').hide();
 		// remove required attribute from authentication field
-		if (!jform_vvvvwcpvxx_required)
+		if (!jform_vvvvwcsvxz_required)
 		{
 			updateFieldRequired('authentication',1);
 			jQuery('#jform_authentication').removeAttr('required');
 			jQuery('#jform_authentication').removeAttr('aria-required');
 			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwcpvxx_required = true;
+			jform_vvvvwcsvxz_required = true;
 		}
 		jQuery('#jform_host').closest('.control-group').hide();
 		// remove required attribute from host field
-		if (!jform_vvvvwcpvxy_required)
+		if (!jform_vvvvwcsvya_required)
 		{
 			updateFieldRequired('host',1);
 			jQuery('#jform_host').removeAttr('required');
 			jQuery('#jform_host').removeAttr('aria-required');
 			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwcpvxy_required = true;
+			jform_vvvvwcsvya_required = true;
 		}
 		jQuery('#jform_port').closest('.control-group').hide();
 		// remove required attribute from port field
-		if (!jform_vvvvwcpvxz_required)
+		if (!jform_vvvvwcsvyb_required)
 		{
 			updateFieldRequired('port',1);
 			jQuery('#jform_port').removeAttr('required');
 			jQuery('#jform_port').removeAttr('aria-required');
 			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwcpvxz_required = true;
+			jform_vvvvwcsvyb_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwcpvya_required)
+		if (!jform_vvvvwcsvyc_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwcpvya_required = true;
+			jform_vvvvwcsvyc_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_vvvvwcpvyb_required)
+		if (!jform_vvvvwcsvyd_required)
 		{
 			updateFieldRequired('username',1);
 			jQuery('#jform_username').removeAttr('required');
 			jQuery('#jform_username').removeAttr('aria-required');
 			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwcpvyb_required = true;
+			jform_vvvvwcsvyd_required = true;
 		}
 	}
 }
 
-// the vvvvwcp Some function
-function protocol_vvvvwcp_SomeFunc(protocol_vvvvwcp)
+// the vvvvwcs Some function
+function protocol_vvvvwcs_SomeFunc(protocol_vvvvwcs)
 {
 	// set the function logic
-	if (protocol_vvvvwcp == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwcq function
-function vvvvwcq(protocol_vvvvwcq)
-{
-	if (isSet(protocol_vvvvwcq) && protocol_vvvvwcq.constructor !== Array)
-	{
-		var temp_vvvvwcq = protocol_vvvvwcq;
-		var protocol_vvvvwcq = [];
-		protocol_vvvvwcq.push(temp_vvvvwcq);
-	}
-	else if (!isSet(protocol_vvvvwcq))
-	{
-		var protocol_vvvvwcq = [];
-	}
-	var protocol = protocol_vvvvwcq.some(protocol_vvvvwcq_SomeFunc);
-
-
-	// 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
-		if (jform_vvvvwcqvyc_required)
-		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwcqvyc_required = false;
-		}
-	}
-	else
-	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
-		// remove required attribute from signature field
-		if (!jform_vvvvwcqvyc_required)
-		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwcqvyc_required = true;
-		}
-	}
-}
-
-// the vvvvwcq Some function
-function protocol_vvvvwcq_SomeFunc(protocol_vvvvwcq)
-{
-	// set the function logic
-	if (protocol_vvvvwcq == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwcr function
-function vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr)
-{
-	if (isSet(protocol_vvvvwcr) && protocol_vvvvwcr.constructor !== Array)
-	{
-		var temp_vvvvwcr = protocol_vvvvwcr;
-		var protocol_vvvvwcr = [];
-		protocol_vvvvwcr.push(temp_vvvvwcr);
-	}
-	else if (!isSet(protocol_vvvvwcr))
-	{
-		var protocol_vvvvwcr = [];
-	}
-	var protocol = protocol_vvvvwcr.some(protocol_vvvvwcr_SomeFunc);
-
-	if (isSet(authentication_vvvvwcr) && authentication_vvvvwcr.constructor !== Array)
-	{
-		var temp_vvvvwcr = authentication_vvvvwcr;
-		var authentication_vvvvwcr = [];
-		authentication_vvvvwcr.push(temp_vvvvwcr);
-	}
-	else if (!isSet(authentication_vvvvwcr))
-	{
-		var authentication_vvvvwcr = [];
-	}
-	var authentication = authentication_vvvvwcr.some(authentication_vvvvwcr_SomeFunc);
-
-
-	// set this function logic
-	if (protocol && authentication)
-	{
-		jQuery('#jform_password').closest('.control-group').show();
-		// add required attribute to password field
-		if (jform_vvvvwcrvyd_required)
-		{
-			updateFieldRequired('password',0);
-			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
-			jform_vvvvwcrvyd_required = false;
-		}
-	}
-	else
-	{
-		jQuery('#jform_password').closest('.control-group').hide();
-		// remove required attribute from password field
-		if (!jform_vvvvwcrvyd_required)
-		{
-			updateFieldRequired('password',1);
-			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwcrvyd_required = true;
-		}
-	}
-}
-
-// the vvvvwcr Some function
-function protocol_vvvvwcr_SomeFunc(protocol_vvvvwcr)
-{
-	// set the function logic
-	if (protocol_vvvvwcr == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwcr Some function
-function authentication_vvvvwcr_SomeFunc(authentication_vvvvwcr)
-{
-	// set the function logic
-	if (authentication_vvvvwcr == 1 || authentication_vvvvwcr == 3 || authentication_vvvvwcr == 5)
+	if (protocol_vvvvwcs == 2)
 	{
 		return true;
 	}
@@ -321,7 +184,7 @@ function authentication_vvvvwcr_SomeFunc(authentication_vvvvwcr)
 }
 
 // the vvvvwct function
-function vvvvwct(protocol_vvvvwct,authentication_vvvvwct)
+function vvvvwct(protocol_vvvvwct)
 {
 	if (isSet(protocol_vvvvwct) && protocol_vvvvwct.constructor !== Array)
 	{
@@ -335,43 +198,33 @@ function vvvvwct(protocol_vvvvwct,authentication_vvvvwct)
 	}
 	var protocol = protocol_vvvvwct.some(protocol_vvvvwct_SomeFunc);
 
-	if (isSet(authentication_vvvvwct) && authentication_vvvvwct.constructor !== Array)
-	{
-		var temp_vvvvwct = authentication_vvvvwct;
-		var authentication_vvvvwct = [];
-		authentication_vvvvwct.push(temp_vvvvwct);
-	}
-	else if (!isSet(authentication_vvvvwct))
-	{
-		var authentication_vvvvwct = [];
-	}
-	var authentication = authentication_vvvvwct.some(authentication_vvvvwct_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_private').closest('.control-group').show();
-		// add required attribute to private field
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
+		// add required attribute to signature field
 		if (jform_vvvvwctvye_required)
 		{
-			updateFieldRequired('private',0);
-			jQuery('#jform_private').prop('required','required');
-			jQuery('#jform_private').attr('aria-required',true);
-			jQuery('#jform_private').addClass('required');
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
 			jform_vvvvwctvye_required = false;
 		}
 	}
 	else
 	{
-		jQuery('#jform_private').closest('.control-group').hide();
-		// remove required attribute from private field
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
+		// remove required attribute from signature field
 		if (!jform_vvvvwctvye_required)
 		{
-			updateFieldRequired('private',1);
-			jQuery('#jform_private').removeAttr('required');
-			jQuery('#jform_private').removeAttr('aria-required');
-			jQuery('#jform_private').removeClass('required');
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
 			jform_vvvvwctvye_required = true;
 		}
 	}
@@ -381,50 +234,197 @@ function vvvvwct(protocol_vvvvwct,authentication_vvvvwct)
 function protocol_vvvvwct_SomeFunc(protocol_vvvvwct)
 {
 	// set the function logic
-	if (protocol_vvvvwct == 2)
+	if (protocol_vvvvwct == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwct Some function
-function authentication_vvvvwct_SomeFunc(authentication_vvvvwct)
+// the vvvvwcu function
+function vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu)
+{
+	if (isSet(protocol_vvvvwcu) && protocol_vvvvwcu.constructor !== Array)
+	{
+		var temp_vvvvwcu = protocol_vvvvwcu;
+		var protocol_vvvvwcu = [];
+		protocol_vvvvwcu.push(temp_vvvvwcu);
+	}
+	else if (!isSet(protocol_vvvvwcu))
+	{
+		var protocol_vvvvwcu = [];
+	}
+	var protocol = protocol_vvvvwcu.some(protocol_vvvvwcu_SomeFunc);
+
+	if (isSet(authentication_vvvvwcu) && authentication_vvvvwcu.constructor !== Array)
+	{
+		var temp_vvvvwcu = authentication_vvvvwcu;
+		var authentication_vvvvwcu = [];
+		authentication_vvvvwcu.push(temp_vvvvwcu);
+	}
+	else if (!isSet(authentication_vvvvwcu))
+	{
+		var authentication_vvvvwcu = [];
+	}
+	var authentication = authentication_vvvvwcu.some(authentication_vvvvwcu_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		// add required attribute to password field
+		if (jform_vvvvwcuvyf_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwcuvyf_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		// remove required attribute from password field
+		if (!jform_vvvvwcuvyf_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwcuvyf_required = true;
+		}
+	}
+}
+
+// the vvvvwcu Some function
+function protocol_vvvvwcu_SomeFunc(protocol_vvvvwcu)
 {
 	// set the function logic
-	if (authentication_vvvvwct == 2 || authentication_vvvvwct == 3)
+	if (protocol_vvvvwcu == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcv function
-function vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv)
+// the vvvvwcu Some function
+function authentication_vvvvwcu_SomeFunc(authentication_vvvvwcu)
 {
-	if (isSet(protocol_vvvvwcv) && protocol_vvvvwcv.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwcu == 1 || authentication_vvvvwcu == 3 || authentication_vvvvwcu == 5)
 	{
-		var temp_vvvvwcv = protocol_vvvvwcv;
-		var protocol_vvvvwcv = [];
-		protocol_vvvvwcv.push(temp_vvvvwcv);
+		return true;
 	}
-	else if (!isSet(protocol_vvvvwcv))
-	{
-		var protocol_vvvvwcv = [];
-	}
-	var protocol = protocol_vvvvwcv.some(protocol_vvvvwcv_SomeFunc);
+	return false;
+}
 
-	if (isSet(authentication_vvvvwcv) && authentication_vvvvwcv.constructor !== Array)
+// the vvvvwcw function
+function vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw)
+{
+	if (isSet(protocol_vvvvwcw) && protocol_vvvvwcw.constructor !== Array)
 	{
-		var temp_vvvvwcv = authentication_vvvvwcv;
-		var authentication_vvvvwcv = [];
-		authentication_vvvvwcv.push(temp_vvvvwcv);
+		var temp_vvvvwcw = protocol_vvvvwcw;
+		var protocol_vvvvwcw = [];
+		protocol_vvvvwcw.push(temp_vvvvwcw);
 	}
-	else if (!isSet(authentication_vvvvwcv))
+	else if (!isSet(protocol_vvvvwcw))
 	{
-		var authentication_vvvvwcv = [];
+		var protocol_vvvvwcw = [];
 	}
-	var authentication = authentication_vvvvwcv.some(authentication_vvvvwcv_SomeFunc);
+	var protocol = protocol_vvvvwcw.some(protocol_vvvvwcw_SomeFunc);
+
+	if (isSet(authentication_vvvvwcw) && authentication_vvvvwcw.constructor !== Array)
+	{
+		var temp_vvvvwcw = authentication_vvvvwcw;
+		var authentication_vvvvwcw = [];
+		authentication_vvvvwcw.push(temp_vvvvwcw);
+	}
+	else if (!isSet(authentication_vvvvwcw))
+	{
+		var authentication_vvvvwcw = [];
+	}
+	var authentication = authentication_vvvvwcw.some(authentication_vvvvwcw_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_private').closest('.control-group').show();
+		// add required attribute to private field
+		if (jform_vvvvwcwvyg_required)
+		{
+			updateFieldRequired('private',0);
+			jQuery('#jform_private').prop('required','required');
+			jQuery('#jform_private').attr('aria-required',true);
+			jQuery('#jform_private').addClass('required');
+			jform_vvvvwcwvyg_required = false;
+		}
+	}
+	else
+	{
+		jQuery('#jform_private').closest('.control-group').hide();
+		// remove required attribute from private field
+		if (!jform_vvvvwcwvyg_required)
+		{
+			updateFieldRequired('private',1);
+			jQuery('#jform_private').removeAttr('required');
+			jQuery('#jform_private').removeAttr('aria-required');
+			jQuery('#jform_private').removeClass('required');
+			jform_vvvvwcwvyg_required = true;
+		}
+	}
+}
+
+// the vvvvwcw Some function
+function protocol_vvvvwcw_SomeFunc(protocol_vvvvwcw)
+{
+	// set the function logic
+	if (protocol_vvvvwcw == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcw Some function
+function authentication_vvvvwcw_SomeFunc(authentication_vvvvwcw)
+{
+	// set the function logic
+	if (authentication_vvvvwcw == 2 || authentication_vvvvwcw == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwcy function
+function vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy)
+{
+	if (isSet(protocol_vvvvwcy) && protocol_vvvvwcy.constructor !== Array)
+	{
+		var temp_vvvvwcy = protocol_vvvvwcy;
+		var protocol_vvvvwcy = [];
+		protocol_vvvvwcy.push(temp_vvvvwcy);
+	}
+	else if (!isSet(protocol_vvvvwcy))
+	{
+		var protocol_vvvvwcy = [];
+	}
+	var protocol = protocol_vvvvwcy.some(protocol_vvvvwcy_SomeFunc);
+
+	if (isSet(authentication_vvvvwcy) && authentication_vvvvwcy.constructor !== Array)
+	{
+		var temp_vvvvwcy = authentication_vvvvwcy;
+		var authentication_vvvvwcy = [];
+		authentication_vvvvwcy.push(temp_vvvvwcy);
+	}
+	else if (!isSet(authentication_vvvvwcy))
+	{
+		var authentication_vvvvwcy = [];
+	}
+	var authentication = authentication_vvvvwcy.some(authentication_vvvvwcy_SomeFunc);
 
 
 	// set this function logic
@@ -432,78 +432,78 @@ function vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwcvvyf_required)
+		if (jform_vvvvwcyvyh_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_vvvvwcvvyf_required = false;
+			jform_vvvvwcyvyh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwcvvyf_required)
+		if (!jform_vvvvwcyvyh_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_vvvvwcvvyf_required = true;
+			jform_vvvvwcyvyh_required = true;
 		}
 	}
 }
 
-// the vvvvwcv Some function
-function protocol_vvvvwcv_SomeFunc(protocol_vvvvwcv)
+// the vvvvwcy Some function
+function protocol_vvvvwcy_SomeFunc(protocol_vvvvwcy)
 {
 	// set the function logic
-	if (protocol_vvvvwcv == 2)
+	if (protocol_vvvvwcy == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcv Some function
-function authentication_vvvvwcv_SomeFunc(authentication_vvvvwcv)
+// the vvvvwcy Some function
+function authentication_vvvvwcy_SomeFunc(authentication_vvvvwcy)
 {
 	// set the function logic
-	if (authentication_vvvvwcv == 4 || authentication_vvvvwcv == 5)
+	if (authentication_vvvvwcy == 4 || authentication_vvvvwcy == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcx function
-function vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx)
+// the vvvvwda function
+function vvvvwda(protocol_vvvvwda,authentication_vvvvwda)
 {
-	if (isSet(protocol_vvvvwcx) && protocol_vvvvwcx.constructor !== Array)
+	if (isSet(protocol_vvvvwda) && protocol_vvvvwda.constructor !== Array)
 	{
-		var temp_vvvvwcx = protocol_vvvvwcx;
-		var protocol_vvvvwcx = [];
-		protocol_vvvvwcx.push(temp_vvvvwcx);
+		var temp_vvvvwda = protocol_vvvvwda;
+		var protocol_vvvvwda = [];
+		protocol_vvvvwda.push(temp_vvvvwda);
 	}
-	else if (!isSet(protocol_vvvvwcx))
+	else if (!isSet(protocol_vvvvwda))
 	{
-		var protocol_vvvvwcx = [];
+		var protocol_vvvvwda = [];
 	}
-	var protocol = protocol_vvvvwcx.some(protocol_vvvvwcx_SomeFunc);
+	var protocol = protocol_vvvvwda.some(protocol_vvvvwda_SomeFunc);
 
-	if (isSet(authentication_vvvvwcx) && authentication_vvvvwcx.constructor !== Array)
+	if (isSet(authentication_vvvvwda) && authentication_vvvvwda.constructor !== Array)
 	{
-		var temp_vvvvwcx = authentication_vvvvwcx;
-		var authentication_vvvvwcx = [];
-		authentication_vvvvwcx.push(temp_vvvvwcx);
+		var temp_vvvvwda = authentication_vvvvwda;
+		var authentication_vvvvwda = [];
+		authentication_vvvvwda.push(temp_vvvvwda);
 	}
-	else if (!isSet(authentication_vvvvwcx))
+	else if (!isSet(authentication_vvvvwda))
 	{
-		var authentication_vvvvwcx = [];
+		var authentication_vvvvwda = [];
 	}
-	var authentication = authentication_vvvvwcx.some(authentication_vvvvwcx_SomeFunc);
+	var authentication = authentication_vvvvwda.some(authentication_vvvvwda_SomeFunc);
 
 
 	// set this function logic
@@ -517,22 +517,22 @@ function vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx)
 	}
 }
 
-// the vvvvwcx Some function
-function protocol_vvvvwcx_SomeFunc(protocol_vvvvwcx)
+// the vvvvwda Some function
+function protocol_vvvvwda_SomeFunc(protocol_vvvvwda)
 {
 	// set the function logic
-	if (protocol_vvvvwcx == 2)
+	if (protocol_vvvvwda == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwcx Some function
-function authentication_vvvvwcx_SomeFunc(authentication_vvvvwcx)
+// the vvvvwda Some function
+function authentication_vvvvwda_SomeFunc(authentication_vvvvwda)
 {
 	// set the function logic
-	if (authentication_vvvvwcx == 2 || authentication_vvvvwcx == 3 || authentication_vvvvwcx == 4 || authentication_vvvvwcx == 5)
+	if (authentication_vvvvwda == 2 || authentication_vvvvwda == 3 || authentication_vvvvwda == 4 || authentication_vvvvwda == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 36d4f123e..f51d5c1bb 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -861,7 +861,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				{
 					// load the model
 					$_Model = ComponentbuilderHelper::getModel($_updateTable);
-					// change publish state
+					// delete items
 					$_Model->delete($_pks);
 				}
 			}
diff --git a/admin/models/server.php b/admin/models/server.php
index 21e601b5f..3d77e820b 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -189,7 +189,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVyglinked_components()
+	public function getVyilinked_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 62c520eb1..ca42bb5c9 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -1942,7 +1942,7 @@ 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, '', ''),
+(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.\"},\"properties13\":{\"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)\"},\"properties14\":{\"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)\"},\"properties15\":{\"name\":\"timeformat\",\"example\":\"\",\"adjustable\":\"1\",\"description\":\"(optional): can be set to 12 (and specify AM or PM) or 24 (starting with 3.7.0)\"},\"properties16\":{\"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)\"},\"properties17\":{\"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)\"},\"properties18\":{\"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)\"},\"properties19\":{\"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)\"},\"properties20\":{\"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)\"},\"properties21\":{\"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, 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, '', ''),
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index 2787fb998..dd5e12a5b 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -207,97 +207,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwbx function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwbx = jQuery("#jform_store").val();
-	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
-	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwbx = jQuery("#jform_store").val();
-	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
-	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwbx function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwbx = jQuery("#jform_store").val();
 	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
-	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+	vvvvwbx(datatype_vvvvwbx);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwbx = jQuery("#jform_store").val();
 	var datatype_vvvvwbx = jQuery("#jform_datatype").val();
-	vvvvwbx(store_vvvvwbx,datatype_vvvvwbx);
+	vvvvwbx(datatype_vvvvwbx);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwbz function
+// #jform_store listeners for store_vvvvwby function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwby = jQuery("#jform_store").val();
+	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwby = jQuery("#jform_store").val();
+	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwby function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwby = jQuery("#jform_store").val();
+	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwby = jQuery("#jform_store").val();
+	var datatype_vvvvwby = jQuery("#jform_datatype").val();
+	vvvvwby(store_vvvvwby,datatype_vvvvwby);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwca function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwbz(add_css_view_vvvvwbz);
+	var add_css_view_vvvvwca = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwca(add_css_view_vvvvwca);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwbz = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwbz(add_css_view_vvvvwbz);
+	var add_css_view_vvvvwca = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwca(add_css_view_vvvvwca);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwca function
+// #jform_add_css_views listeners for add_css_views_vvvvwcb function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwca(add_css_views_vvvvwca);
+	var add_css_views_vvvvwcb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwcb(add_css_views_vvvvwcb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwca = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwca(add_css_views_vvvvwca);
+	var add_css_views_vvvvwcb = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwcb(add_css_views_vvvvwcb);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwcb function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwcc function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_view_footer_vvvvwcb);
+	var add_javascript_view_footer_vvvvwcc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwcc(add_javascript_view_footer_vvvvwcc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwcb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwcb(add_javascript_view_footer_vvvvwcb);
+	var add_javascript_view_footer_vvvvwcc = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwcc(add_javascript_view_footer_vvvvwcc);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwcc function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwcd function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_views_footer_vvvvwcc);
+	var add_javascript_views_footer_vvvvwcd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwcd(add_javascript_views_footer_vvvvwcd);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwcc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwcc(add_javascript_views_footer_vvvvwcc);
+	var add_javascript_views_footer_vvvvwcd = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwcd(add_javascript_views_footer_vvvvwcd);
 
 });
 
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index 908cb77c7..9c4a6da68 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -136,230 +136,173 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwcd function
+// #jform_datalenght listeners for datalenght_vvvvwce function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
+	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
+	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwcd function
+// #jform_has_defaults listeners for has_defaults_vvvvwce function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
+	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwcd = jQuery("#jform_datalenght").val();
-	var has_defaults_vvvvwcd = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcd(datalenght_vvvvwcd,has_defaults_vvvvwcd);
+	var datalenght_vvvvwce = jQuery("#jform_datalenght").val();
+	var has_defaults_vvvvwce = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwce(datalenght_vvvvwce,has_defaults_vvvvwce);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwcf function
+// #jform_datadefault listeners for datadefault_vvvvwcg function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
+	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
+	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwcf function
+// #jform_has_defaults listeners for has_defaults_vvvvwcg function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
+	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwcf = jQuery("#jform_datadefault").val();
-	var has_defaults_vvvvwcf = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcf(datadefault_vvvvwcf,has_defaults_vvvvwcf);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwch function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwch function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwch = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwch = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwch(datatype_vvvvwch,has_defaults_vvvvwch);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwci function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
+	var datadefault_vvvvwcg = jQuery("#jform_datadefault").val();
+	var has_defaults_vvvvwcg = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcg(datadefault_vvvvwcg,has_defaults_vvvvwcg);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwci function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
 	var datatype_vvvvwci = jQuery("#jform_datatype").val();
-	vvvvwci(has_defaults_vvvvwci,datatype_vvvvwci);
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwcj function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
-
-});
-
-// #jform_has_defaults listeners for has_defaults_vvvvwcj function
+// #jform_has_defaults listeners for has_defaults_vvvvwci function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var datatype_vvvvwcj = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcj = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcj(datatype_vvvvwcj,has_defaults_vvvvwcj);
+	var datatype_vvvvwci = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwci = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwci(datatype_vvvvwci,has_defaults_vvvvwci);
 
 });
 
-// #jform_store listeners for store_vvvvwcl function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwcl function
+// #jform_datatype listeners for datatype_vvvvwck function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
-	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwck function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwck = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwck = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwck(datatype_vvvvwck,has_defaults_vvvvwck);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwcl function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwcl = jQuery("#jform_store").val();
-	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcl(store_vvvvwcl,datatype_vvvvwcl,has_defaults_vvvvwcl);
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcl function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcl = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var datatype_vvvvwcl = jQuery("#jform_datatype").val();
+	vvvvwcl(has_defaults_vvvvwcl,datatype_vvvvwcl);
 
 });
 
@@ -367,37 +310,16 @@ jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 jQuery('#jform_datatype').on('keyup',function()
 {
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
-
-});
-
-// #jform_store listeners for store_vvvvwcm function
-jQuery('#jform_store').on('keyup',function()
-{
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
-	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
 
 });
 
@@ -405,90 +327,202 @@ jQuery('#adminForm').on('change', '#jform_store',function (e)
 jQuery('#jform_has_defaults').on('keyup',function()
 {
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
 	var datatype_vvvvwcm = jQuery("#jform_datatype").val();
-	var store_vvvvwcm = jQuery("#jform_store").val();
 	var has_defaults_vvvvwcm = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwcm(datatype_vvvvwcm,store_vvvvwcm,has_defaults_vvvvwcm);
+	vvvvwcm(datatype_vvvvwcm,has_defaults_vvvvwcm);
 
 });
 
-// #jform_has_defaults listeners for has_defaults_vvvvwcn function
-jQuery('#jform_has_defaults').on('keyup',function()
-{
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
-
-});
-jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
-{
-	e.preventDefault();
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
-
-});
-
-// #jform_store listeners for store_vvvvwcn function
+// #jform_store listeners for store_vvvvwco function
 jQuery('#jform_store').on('keyup',function()
 {
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
 
 });
 jQuery('#adminForm').on('change', '#jform_store',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
 
 });
 
-// #jform_datatype listeners for datatype_vvvvwcn function
+// #jform_datatype listeners for datatype_vvvvwco function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var has_defaults_vvvvwcn = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	var store_vvvvwcn = jQuery("#jform_store").val();
-	var datatype_vvvvwcn = jQuery("#jform_datatype").val();
-	vvvvwcn(has_defaults_vvvvwcn,store_vvvvwcn,datatype_vvvvwcn);
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
+	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
 
 });
 
 // #jform_has_defaults listeners for has_defaults_vvvvwco function
 jQuery('#jform_has_defaults').on('keyup',function()
 {
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(has_defaults_vvvvwco);
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
 
 });
 jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
 {
 	e.preventDefault();
+	var store_vvvvwco = jQuery("#jform_store").val();
+	var datatype_vvvvwco = jQuery("#jform_datatype").val();
 	var has_defaults_vvvvwco = jQuery("#jform_has_defaults input[type='radio']:checked").val();
-	vvvvwco(has_defaults_vvvvwco);
+	vvvvwco(store_vvvvwco,datatype_vvvvwco,has_defaults_vvvvwco);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcp function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+});
+
+// #jform_store listeners for store_vvvvwcp function
+jQuery('#jform_store').on('keyup',function()
+{
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcp function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwcp = jQuery("#jform_datatype").val();
+	var store_vvvvwcp = jQuery("#jform_store").val();
+	var has_defaults_vvvvwcp = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcp(datatype_vvvvwcp,store_vvvvwcp,has_defaults_vvvvwcp);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcq function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+});
+
+// #jform_store listeners for store_vvvvwcq function
+jQuery('#jform_store').on('keyup',function()
+{
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwcq function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcq = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	var store_vvvvwcq = jQuery("#jform_store").val();
+	var datatype_vvvvwcq = jQuery("#jform_datatype").val();
+	vvvvwcq(has_defaults_vvvvwcq,store_vvvvwcq,datatype_vvvvwcq);
+
+});
+
+// #jform_has_defaults listeners for has_defaults_vvvvwcr function
+jQuery('#jform_has_defaults').on('keyup',function()
+{
+	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcr(has_defaults_vvvvwcr);
+
+});
+jQuery('#adminForm').on('change', '#jform_has_defaults',function (e)
+{
+	e.preventDefault();
+	var has_defaults_vvvvwcr = jQuery("#jform_has_defaults input[type='radio']:checked").val();
+	vvvvwcr(has_defaults_vvvvwcr);
 
 });
 
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index 21c2c6749..378739acc 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->vxwfields = $this->get('Vxwfields');
+		$this->vxyfields = $this->get('Vxyfields');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 0f93c9b50..fc51fb86d 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -116,93 +116,93 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwcz function
+// #jform_location listeners for location_vvvvwdc function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwcz = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcz(location_vvvvwcz);
+	var location_vvvvwdc = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdc(location_vvvvwdc);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwcz = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwcz(location_vvvvwcz);
+	var location_vvvvwdc = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdc(location_vvvvwdc);
 
 });
 
-// #jform_location listeners for location_vvvvwda function
+// #jform_location listeners for location_vvvvwdd function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(location_vvvvwda);
+	var location_vvvvwdd = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdd(location_vvvvwdd);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwda = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwda(location_vvvvwda);
+	var location_vvvvwdd = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwdd(location_vvvvwdd);
 
 });
 
-// #jform_type listeners for type_vvvvwdb function
+// #jform_type listeners for type_vvvvwde function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwdb = jQuery("#jform_type").val();
-	vvvvwdb(type_vvvvwdb);
+	var type_vvvvwde = jQuery("#jform_type").val();
+	vvvvwde(type_vvvvwde);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwdb = jQuery("#jform_type").val();
-	vvvvwdb(type_vvvvwdb);
+	var type_vvvvwde = jQuery("#jform_type").val();
+	vvvvwde(type_vvvvwde);
 
 });
 
-// #jform_type listeners for type_vvvvwdc function
+// #jform_type listeners for type_vvvvwdf function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwdc = jQuery("#jform_type").val();
-	vvvvwdc(type_vvvvwdc);
+	var type_vvvvwdf = jQuery("#jform_type").val();
+	vvvvwdf(type_vvvvwdf);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwdc = jQuery("#jform_type").val();
-	vvvvwdc(type_vvvvwdc);
+	var type_vvvvwdf = jQuery("#jform_type").val();
+	vvvvwdf(type_vvvvwdf);
 
 });
 
-// #jform_type listeners for type_vvvvwdd function
+// #jform_type listeners for type_vvvvwdg function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwdd = jQuery("#jform_type").val();
-	vvvvwdd(type_vvvvwdd);
+	var type_vvvvwdg = jQuery("#jform_type").val();
+	vvvvwdg(type_vvvvwdg);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwdd = jQuery("#jform_type").val();
-	vvvvwdd(type_vvvvwdd);
+	var type_vvvvwdg = jQuery("#jform_type").val();
+	vvvvwdg(type_vvvvwdg);
 
 });
 
-// #jform_target listeners for target_vvvvwde function
+// #jform_target listeners for target_vvvvwdh function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwde(target_vvvvwde);
+	var target_vvvvwdh = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwdh(target_vvvvwdh);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwde = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwde(target_vvvvwde);
+	var target_vvvvwdh = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwdh(target_vvvvwdh);
 
 });
 
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index 32d63a46e..847c86167 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -125,67 +125,18 @@ $componentParams = $this->params; // will be removed just use $this->params inst
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwcp function
+// #jform_protocol listeners for protocol_vvvvwcs function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcp = jQuery("#jform_protocol").val();
-	vvvvwcp(protocol_vvvvwcp);
+	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	vvvvwcs(protocol_vvvvwcs);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcp = jQuery("#jform_protocol").val();
-	vvvvwcp(protocol_vvvvwcp);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwcq function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	vvvvwcq(protocol_vvvvwcq);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwcq = jQuery("#jform_protocol").val();
-	vvvvwcq(protocol_vvvvwcq);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwcr function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
-
-});
-
-// #jform_authentication listeners for authentication_vvvvwcr function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwcr = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcr = jQuery("#jform_authentication").val();
-	vvvvwcr(protocol_vvvvwcr,authentication_vvvvwcr);
+	var protocol_vvvvwcs = jQuery("#jform_protocol").val();
+	vvvvwcs(protocol_vvvvwcs);
 
 });
 
@@ -193,101 +144,150 @@ jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
+	vvvvwct(protocol_vvvvwct);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
+	vvvvwct(protocol_vvvvwct);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwct function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwct = jQuery("#jform_protocol").val();
-	var authentication_vvvvwct = jQuery("#jform_authentication").val();
-	vvvvwct(protocol_vvvvwct,authentication_vvvvwct);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwcv function
+// #jform_protocol listeners for protocol_vvvvwcu function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcv function
+// #jform_authentication listeners for authentication_vvvvwcu function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcv = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcv = jQuery("#jform_authentication").val();
-	vvvvwcv(protocol_vvvvwcv,authentication_vvvvwcv);
+	var protocol_vvvvwcu = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcu = jQuery("#jform_authentication").val();
+	vvvvwcu(protocol_vvvvwcu,authentication_vvvvwcu);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwcx function
+// #jform_protocol listeners for protocol_vvvvwcw function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
-	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
-	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwcx function
+// #jform_authentication listeners for authentication_vvvvwcw function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
-	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwcx = jQuery("#jform_protocol").val();
-	var authentication_vvvvwcx = jQuery("#jform_authentication").val();
-	vvvvwcx(protocol_vvvvwcx,authentication_vvvvwcx);
+	var protocol_vvvvwcw = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcw = jQuery("#jform_authentication").val();
+	vvvvwcw(protocol_vvvvwcw,authentication_vvvvwcw);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwcy function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwcy function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwcy = jQuery("#jform_protocol").val();
+	var authentication_vvvvwcy = jQuery("#jform_authentication").val();
+	vvvvwcy(protocol_vvvvwcy,authentication_vvvvwcy);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwda function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwda function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwda = jQuery("#jform_protocol").val();
+	var authentication_vvvvwda = jQuery("#jform_authentication").val();
+	vvvvwda(protocol_vvvvwda,authentication_vvvvwda);
 
 });
 
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index c0620398b..7a0228a5b 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->vyglinked_components = $this->get('Vyglinked_components');
+		$this->vyilinked_components = $this->get('Vyilinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 3f217ea50..77ad5cec9 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>10th September, 2019</creationDate>
+	<creationDate>12th September, 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 5fa39b171..619e60c8d 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -2459,8 +2459,9 @@ abstract class ComponentbuilderHelper
 				if (($repoData = self::getFileContents($_url)) !== false && self::checkJson($repoData))
 				{
 					$github_returned = json_decode($repoData);
-					if (self::checkString($target) && self::checkObject($github_returned) &&
-						isset($github_returned->{$target}) && self::checkArray($github_returned->{$target}) )
+					if (self::checkString($target) &&
+						( (self::checkObject($github_returned) && isset($github_returned->{$target}) && self::checkArray($github_returned->{$target})) ||
+						(self::checkArray($github_returned) && isset($github_returned[$target]) && self::checkArray($github_returned[$target])) ))
 					{
 						if ('nomemory' !== $type)
 						{
@@ -2468,7 +2469,7 @@ abstract class ComponentbuilderHelper
 							self::set($type, $repoData);
 						}
 					}
-					elseif (!self::checkString($target) && self::checkObject($github_returned) && !isset($github_returned->message))
+					elseif (!self::checkString($target) && (self::checkArray($github_returned) || (self::checkObject($github_returned) && !isset($github_returned->message))))
 					{
 						if ('nomemory' !== $type)
 						{