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