diff --git a/admin/compiler/joomla_3/JTable.php b/admin/compiler/joomla_3/JTable.php
index e111122de..63ebbd9ee 100644
--- a/admin/compiler/joomla_3/JTable.php
+++ b/admin/compiler/joomla_3/JTable.php
@@ -265,7 +265,7 @@ class ###Component###Table###View### extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php
index b81b79b50..a47bfb352 100644
--- a/admin/tables/admin_fields.php
+++ b/admin/tables/admin_fields.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableAdmin_fields extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php
index 8d5f286dd..0c51e93a5 100644
--- a/admin/tables/admin_fields_conditions.php
+++ b/admin/tables/admin_fields_conditions.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableAdmin_fields_conditions extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php
index 055273805..3066e00c1 100644
--- a/admin/tables/admin_view.php
+++ b/admin/tables/admin_view.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableAdmin_view extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_admin_views.php b/admin/tables/component_admin_views.php
index a359bcba5..9b4628c8e 100644
--- a/admin/tables/component_admin_views.php
+++ b/admin/tables/component_admin_views.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_admin_views extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_config.php b/admin/tables/component_config.php
index 082916d96..36a2c9fd2 100644
--- a/admin/tables/component_config.php
+++ b/admin/tables/component_config.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_config extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_custom_admin_menus.php b/admin/tables/component_custom_admin_menus.php
index e2e132234..a0839cd4f 100644
--- a/admin/tables/component_custom_admin_menus.php
+++ b/admin/tables/component_custom_admin_menus.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_custom_admin_menus extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_custom_admin_views.php b/admin/tables/component_custom_admin_views.php
index d44db2a6d..30a75fcde 100644
--- a/admin/tables/component_custom_admin_views.php
+++ b/admin/tables/component_custom_admin_views.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_custom_admin_views extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_dashboard.php b/admin/tables/component_dashboard.php
index 4792bc70b..461fc660b 100644
--- a/admin/tables/component_dashboard.php
+++ b/admin/tables/component_dashboard.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_dashboard extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_files_folders.php b/admin/tables/component_files_folders.php
index 973153af2..6ab101da6 100644
--- a/admin/tables/component_files_folders.php
+++ b/admin/tables/component_files_folders.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_files_folders extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_mysql_tweaks.php b/admin/tables/component_mysql_tweaks.php
index 6e39206b2..0db29208b 100644
--- a/admin/tables/component_mysql_tweaks.php
+++ b/admin/tables/component_mysql_tweaks.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_mysql_tweaks extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_site_views.php b/admin/tables/component_site_views.php
index 9c2b50a49..28aa866e3 100644
--- a/admin/tables/component_site_views.php
+++ b/admin/tables/component_site_views.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_site_views extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/component_updates.php b/admin/tables/component_updates.php
index 354f09707..1870c7b15 100644
--- a/admin/tables/component_updates.php
+++ b/admin/tables/component_updates.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableComponent_updates extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php
index 8ef64938b..f60592998 100644
--- a/admin/tables/custom_admin_view.php
+++ b/admin/tables/custom_admin_view.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableCustom_admin_view extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php
index a4c184c43..2dd802292 100644
--- a/admin/tables/custom_code.php
+++ b/admin/tables/custom_code.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableCustom_code extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php
index fee87725a..e09939cc5 100644
--- a/admin/tables/dynamic_get.php
+++ b/admin/tables/dynamic_get.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableDynamic_get extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/field.php b/admin/tables/field.php
index 7cb63cd63..11fc0be19 100644
--- a/admin/tables/field.php
+++ b/admin/tables/field.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableField extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php
index eddf282d6..0d16ef0cb 100644
--- a/admin/tables/fieldtype.php
+++ b/admin/tables/fieldtype.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableFieldtype extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 64a7786e5..a51c35db3 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableHelp_document extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php
index f43e6fd89..9fe5134a5 100644
--- a/admin/tables/joomla_component.php
+++ b/admin/tables/joomla_component.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableJoomla_component extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/language.php b/admin/tables/language.php
index 1dfaf11f7..2ea6bdf11 100644
--- a/admin/tables/language.php
+++ b/admin/tables/language.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableLanguage extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php
index ddb5d1ac8..65f61f083 100644
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableLanguage_translation extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/layout.php b/admin/tables/layout.php
index 35017bd8b..cc928a24e 100644
--- a/admin/tables/layout.php
+++ b/admin/tables/layout.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableLayout extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/library.php b/admin/tables/library.php
index c46fcf4f2..174d8cc26 100644
--- a/admin/tables/library.php
+++ b/admin/tables/library.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableLibrary extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/library_config.php b/admin/tables/library_config.php
index e5715f872..975949bc3 100644
--- a/admin/tables/library_config.php
+++ b/admin/tables/library_config.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableLibrary_config extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/library_files_folders_urls.php b/admin/tables/library_files_folders_urls.php
index e25fb08ea..d5ca57a49 100644
--- a/admin/tables/library_files_folders_urls.php
+++ b/admin/tables/library_files_folders_urls.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableLibrary_files_folders_urls extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/server.php b/admin/tables/server.php
index eca257b26..f22730970 100644
--- a/admin/tables/server.php
+++ b/admin/tables/server.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableServer extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php
index b69ea5991..08c8456cd 100644
--- a/admin/tables/site_view.php
+++ b/admin/tables/site_view.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableSite_view extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php
index 1d5fbc224..bafd87f97 100644
--- a/admin/tables/snippet.php
+++ b/admin/tables/snippet.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableSnippet extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/snippet_type.php b/admin/tables/snippet_type.php
index d6da58e5d..cb4e691ba 100644
--- a/admin/tables/snippet_type.php
+++ b/admin/tables/snippet_type.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableSnippet_type extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/template.php b/admin/tables/template.php
index f7836749c..1af880724 100644
--- a/admin/tables/template.php
+++ b/admin/tables/template.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableTemplate extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/tables/validation_rule.php b/admin/tables/validation_rule.php
index 9771bf185..b270f9471 100644
--- a/admin/tables/validation_rule.php
+++ b/admin/tables/validation_rule.php
@@ -265,7 +265,7 @@ class ComponentbuilderTableValidation_rule extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);
diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php
index a22f24b41..7d4367790 100644
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@@ -279,7 +279,7 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 
 
-<?php $numberAddconditions = range(0, count($this->item->addconditions) + 3, 1);?>
+<?php $numberAddconditions = range(0, count( (array) $this->item->addconditions) + 3, 1);?>
 
 // for the values already set
 jQuery(document).ready(function(){