diff --git a/README.md b/README.md
index c04ba14c3..f4e2b29ed 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*: 18th September, 2020
++ *Last Build*: 6th October, 2020
 + *Version*: 2.11.6
 + *Copyright*: Copyright (C) 2015 - 2020 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 c04ba14c3..f4e2b29ed 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*: 18th September, 2020
++ *Last Build*: 6th October, 2020
 + *Version*: 2.11.6
 + *Copyright*: Copyright (C) 2015 - 2020 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 1ee211a75..17ae26cbe 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -3026,6 +3026,12 @@ class Get
 					{
 						// update GUI mapper field
 						$guiMapper['field'] = $importScripter;
+						$guiMapper['type'] = 'php';
+						// Make sure html gets HTML comment for placeholder
+						if ('html_import_view' === $importScripter)
+						{
+							$guiMapper['type'] = 'html';
+						}
 						$this->setCustomScriptBuilder(
 							$view->$importScripter,
 							$importScripter,
@@ -3046,7 +3052,6 @@ class Get
 					}
 				}
 			}
-
 			// add_Ajax for this view
 			if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
 			{
@@ -3080,6 +3085,8 @@ class Get
 				}
 				if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
 				{
+					// make sure we are still in PHP
+					$guiMapper['type'] = 'php';
 					// update GUI mapper field
 					$guiMapper['field'] = 'php_ajaxmethod';
 					$this->setCustomScriptBuilder(
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 92981d422..75bcf5a1a 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>18th September, 2020</creationDate>
+	<creationDate>6th October, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>