diff --git a/README.md b/README.md
index e234f4003..dd76571ff 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th December, 2019
++ *Last Build*: 23rd December, 2019
 + *Version*: 2.10.9
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/README.txt b/admin/README.txt
index e234f4003..dd76571ff 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,7 +144,7 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th December, 2019
++ *Last Build*: 23rd December, 2019
 + *Version*: 2.10.9
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 5e76ac5a6..3acd27bd8 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -6387,7 +6387,7 @@ class Get
 				// update the name if it has dynamic values
 				$module->code_name = ComponentbuilderHelper::safeClassFunctionName($module->name);
 				// set official name
-				$module->official_name = ucwords($module->name);
+				$module->official_name = ComponentbuilderHelper::safeString($module->name, 'W');
 				// set langPrefix
 				$this->langPrefix = 'MOD_' . strtoupper($module->code_name);
 				// set lang prefix
@@ -7975,7 +7975,7 @@ class Get
 				// get the GUI target details
 				$query = explode('.', trim($first_line, '.'));
 				// only continue if we have 3 values in the query
-				if (is_array($query) && count($query) == 3)
+				if (is_array($query) && count($query) >= 3)
 				{
 					// cleanup the newlines around the code
 					$code = trim(str_replace($first_line, '', $code), PHP_EOL) . PHP_EOL;
diff --git a/componentbuilder.xml b/componentbuilder.xml
index fe42489d0..b1f32f3f2 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>16th December, 2019</creationDate>
+	<creationDate>23rd December, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>