diff --git a/README.md b/README.md
index 4c75aa759..3bc334c57 100644
--- a/README.md
+++ b/README.md
@@ -144,11 +144,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*: 14th January, 2019
++ *Last Build*: 21st January, 2019
 + *Version*: 2.9.8
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195803**
++ *Line count*: **195813**
 + *Field count*: **1087**
 + *File count*: **1275**
 + *Folder count*: **201**
diff --git a/admin/README.txt b/admin/README.txt
index 4c75aa759..3bc334c57 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,11 +144,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*: 14th January, 2019
++ *Last Build*: 21st January, 2019
 + *Version*: 2.9.8
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195803**
++ *Line count*: **195813**
 + *Field count*: **1087**
 + *File count*: **1275**
 + *Folder count*: **201**
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 723ec17da..ed157c52c 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -4915,7 +4915,7 @@ class Get
 			// when the custom code is loaded
 			if ($loaded === true)
 			{
-				$string = $this->insertCustomCode($string, $debug);
+				$string = $this->insertCustomCode($bucket, $string, $debug);
 			}
 			// if debug
 			if ($debug)
@@ -4936,19 +4936,13 @@ class Get
 	 * @return  string on success
 	 * 
 	 */
-	protected function insertCustomCode($string, $debug = 0)
+	protected function insertCustomCode($ids, $string, $debug = 0)
 	{
 		$code = array();
-		// if debug
-		if ($debug)
-		{
-			echo '$this->customCode:';
-			var_dump($this->customCode);
-		}
 		// load the code
-		foreach ($this->customCode as $item)
+		foreach ($ids as $id)
 		{
-			$this->buildCustomCodePlaceholders($item, $code, $debug);
+			$this->buildCustomCodePlaceholders($this->customCodeMemory[$id], $code, $debug);
 		}
 		// if debug
 		if ($debug)
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index d01400bcc..5d740ada3 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -3895,8 +3895,13 @@ abstract class ComponentbuilderHelper
 	* @return  string    On success the edit url
 	* 
 	*/
-	public static function  getEditURL(&$item, $view, $views, $ref = '', $component = 'com_componentbuilder', $jRoute = true)
+	public static function getEditURL(&$item, $view, $views, $ref = '', $component = 'com_componentbuilder', $jRoute = true)
 	{
+		// make sure the user has access to view
+		if (!JFactory::getUser()->authorise($view. '.access', $component))
+		{
+			return false;
+		}
 		// build record
 		$record = new stdClass();
 		// check that we have the ID
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 748a74c0e..d49e7bcce 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -3703,7 +3703,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div c
 <div id='usedin-c' style='display:none;'><h2>Admin Views</h2><div id='area-c'></div></div>
 <div id='usedin-d' style='display:none;'><h2>Admin Fields Relations</h2><div id='area-d'></div></div>
 <div id='usedin-e' style='display:none;'><h2>Custom Admin Views</h2><div id='area-e'></div></div>
-<div id='usedin-f' style='display:none;'><h2>Site Views</h2><div id='area-r'></div></div>
+<div id='usedin-f' style='display:none;'><h2>Site Views</h2><div id='area-f'></div></div>
 <div id='usedin-g' style='display:none;'><h2>Fields</h2><div id='area-g'></div></div>
 <div id='usedin-h' style='display:none;'><h2>Fieldtypes</h2><div id='area-h'></div></div>
 <div id='usedin-i' style='display:none;'><h2>Dynamic Gets</h2><div id='area-i'></div></div>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 98a3d4904..483d4235a 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>14th January, 2019</creationDate>
+	<creationDate>21st January, 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 12b80039a..8e32c9a03 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -3895,8 +3895,13 @@ abstract class ComponentbuilderHelper
 	* @return  string    On success the edit url
 	* 
 	*/
-	public static function  getEditURL(&$item, $view, $views, $ref = '', $component = 'com_componentbuilder', $jRoute = true)
+	public static function getEditURL(&$item, $view, $views, $ref = '', $component = 'com_componentbuilder', $jRoute = true)
 	{
+		// make sure the user has access to view
+		if (!JFactory::getUser()->authorise($view. '.access', $component))
+		{
+			return false;
+		}
 		// build record
 		$record = new stdClass();
 		// check that we have the ID