diff --git a/e107_admin/theme.php b/e107_admin/theme.php
index ab5b49b81..ae10d5cef 100644
--- a/e107_admin/theme.php
+++ b/e107_admin/theme.php
@@ -721,7 +721,7 @@ class theme_admin_tree_model extends e_tree_model
 	 * Load data from theme meta file.
 	 * @param bool $force
 	 */
-	function load($force=false)
+	function loadBatch($force=false)
 	{
 		$themeList  = e107::getTheme()->getList();
 		$newArray   = array();
@@ -786,7 +786,7 @@ class theme_admin_online_tree_model extends e_tree_model
 	 * Load data from theme meta file.
 	 * @param bool $force
 	 */
-	function load($force=false)
+	function loadBatch($force=false)
 	{
 		$themeList  = e107::getTheme()->getList();
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 93a667bd8..6b23a1685 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -4816,9 +4816,16 @@ var_dump($select_options);*/
 			break;
 		}
 
+		if(!empty($attributes['grid']) && empty($attributes['type']))
+		{
+			return null;
+		}
+
 		if(empty($attributes['type']))
 		{
 			e107::getDebug()->log("Field '".$field."' is missing a value for 'type'.");
+		//	e107::getDebug()->log($value);
+		//	e107::getDebug()->log($attributes);
 		}