diff --git a/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php b/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php
index 7c98b98e..09fb3d2e 100644
--- a/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php
+++ b/source/packages/com_mokosuiteclient/admin/src/Controller/DisplayController.php
@@ -812,7 +812,11 @@ class DisplayController extends BaseController
 
 	public function togglePublished()
 	{
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
+		if (!Session::checkToken())
+		{
+			$this->jsonResponse(['success' => false, 'message' => Text::_('JINVALID_TOKEN')]);
+			return;
+		}
 
 		if (!$this->checkAcl('core.admin'))
 		{
diff --git a/source/packages/com_mokosuiteclient/admin/src/Model/ConditionsModel.php b/source/packages/com_mokosuiteclient/admin/src/Model/ConditionsModel.php
index 2bfb92e8..2396bc3a 100644
--- a/source/packages/com_mokosuiteclient/admin/src/Model/ConditionsModel.php
+++ b/source/packages/com_mokosuiteclient/admin/src/Model/ConditionsModel.php
@@ -31,6 +31,12 @@ class ConditionsModel extends BaseDatabaseModel
 				$db->quoteName('c.color'),
 				$db->quoteName('c.match_all'),
 				$db->quoteName('c.published'),
+				'(SELECT COUNT(*) FROM ' . $db->quoteName('#__mokosuiteclient_conditions_groups')
+					. ' WHERE ' . $db->quoteName('condition_id') . ' = ' . $db->quoteName('c.id') . ') AS group_count',
+				'(SELECT COUNT(*) FROM ' . $db->quoteName('#__mokosuiteclient_conditions_rules', 'r')
+					. ' INNER JOIN ' . $db->quoteName('#__mokosuiteclient_conditions_groups', 'g')
+					. ' ON ' . $db->quoteName('g.id') . ' = ' . $db->quoteName('r.group_id')
+					. ' WHERE ' . $db->quoteName('g.condition_id') . ' = ' . $db->quoteName('c.id') . ') AS rule_count',
 			])
 			->from($db->quoteName('#__mokosuiteclient_conditions', 'c'));
 
diff --git a/source/packages/com_mokosuiteclient/admin/src/View/Conditions/HtmlView.php b/source/packages/com_mokosuiteclient/admin/src/View/Conditions/HtmlView.php
index 6bd4890b..34933d65 100644
--- a/source/packages/com_mokosuiteclient/admin/src/View/Conditions/HtmlView.php
+++ b/source/packages/com_mokosuiteclient/admin/src/View/Conditions/HtmlView.php
@@ -39,12 +39,6 @@ class HtmlView extends BaseHtmlView
 		$this->items = $model->getItems($this->filters, $limit, $offset);
 		$this->total = $model->getTotal($this->filters);
 
-		foreach ($this->items as $item)
-		{
-			$item->group_count = $model->getGroupCount((int) $item->id);
-			$item->rule_count  = $model->getRuleCount((int) $item->id);
-		}
-
 		$this->addToolbar();
 
 		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
diff --git a/source/packages/com_mokosuiteclient/admin/tmpl/conditions/default.php b/source/packages/com_mokosuiteclient/admin/tmpl/conditions/default.php
index b0476cc8..a416ec36 100644
--- a/source/packages/com_mokosuiteclient/admin/tmpl/conditions/default.php
+++ b/source/packages/com_mokosuiteclient/admin/tmpl/conditions/default.php
@@ -132,6 +132,9 @@ document.addEventListener('DOMContentLoaded', function() {
 					badge.className = 'mokosuite-toggle-published badge bg-' + (pub ? 'success' : 'danger');
 					badge.textContent = pub ? 'Published' : 'Unpublished';
 				}
+			}).catch(function() {
+				badge.textContent = 'Error';
+				badge.className = 'mokosuite-toggle-published badge bg-warning text-dark';
 			});
 		});
 	});
diff --git a/source/packages/com_mokosuiteclient/admin/tmpl/modules/default.php b/source/packages/com_mokosuiteclient/admin/tmpl/modules/default.php
index d57aa6bc..b85ec70b 100644
--- a/source/packages/com_mokosuiteclient/admin/tmpl/modules/default.php
+++ b/source/packages/com_mokosuiteclient/admin/tmpl/modules/default.php
@@ -142,6 +142,9 @@ document.addEventListener('DOMContentLoaded', function() {
 					badge.className = 'mokosuite-toggle-module badge bg-' + (pub ? 'success' : 'danger');
 					badge.textContent = pub ? 'Published' : 'Unpublished';
 				}
+			}).catch(function() {
+				badge.textContent = 'Error';
+				badge.className = 'mokosuite-toggle-module badge bg-warning text-dark';
 			});
 		});
 	});
diff --git a/source/packages/com_mokosuiteclient/admin/tmpl/replacements/default.php b/source/packages/com_mokosuiteclient/admin/tmpl/replacements/default.php
index 8f817986..28d5013f 100644
--- a/source/packages/com_mokosuiteclient/admin/tmpl/replacements/default.php
+++ b/source/packages/com_mokosuiteclient/admin/tmpl/replacements/default.php
@@ -132,6 +132,9 @@ document.addEventListener('DOMContentLoaded', function() {
 					badge.className = 'mokosuite-toggle-published badge bg-' + (pub ? 'success' : 'danger');
 					badge.textContent = pub ? 'Published' : 'Unpublished';
 				}
+			}).catch(function() {
+				badge.textContent = 'Error';
+				badge.className = 'mokosuite-toggle-published badge bg-warning text-dark';
 			});
 		});
 	});
diff --git a/source/packages/com_mokosuiteclient/admin/tmpl/snippets/default.php b/source/packages/com_mokosuiteclient/admin/tmpl/snippets/default.php
index 8be8dc22..5540495a 100644
--- a/source/packages/com_mokosuiteclient/admin/tmpl/snippets/default.php
+++ b/source/packages/com_mokosuiteclient/admin/tmpl/snippets/default.php
@@ -131,6 +131,9 @@ document.addEventListener('DOMContentLoaded', function() {
 					badge.className = 'mokosuite-toggle-published badge bg-' + (pub ? 'success' : 'danger');
 					badge.textContent = pub ? 'Published' : 'Unpublished';
 				}
+			}).catch(function() {
+				badge.textContent = 'Error';
+				badge.className = 'mokosuite-toggle-published badge bg-warning text-dark';
 			});
 		});
 	});
diff --git a/source/packages/com_mokosuiteclient/admin/tmpl/templates/default.php b/source/packages/com_mokosuiteclient/admin/tmpl/templates/default.php
index f8de1b5d..e2687125 100644
--- a/source/packages/com_mokosuiteclient/admin/tmpl/templates/default.php
+++ b/source/packages/com_mokosuiteclient/admin/tmpl/templates/default.php
@@ -131,6 +131,9 @@ document.addEventListener('DOMContentLoaded', function() {
 					badge.className = 'mokosuite-toggle-published badge bg-' + (pub ? 'success' : 'danger');
 					badge.textContent = pub ? 'Published' : 'Unpublished';
 				}
+			}).catch(function() {
+				badge.textContent = 'Error';
+				badge.className = 'mokosuite-toggle-published badge bg-warning text-dark';
 			});
 		});
 	});