diff --git a/core/Requirement/Prohibited_categories.php b/core/Requirement/Prohibited_categories.php
index c99f5cf9..a08fae67 100644
--- a/core/Requirement/Prohibited_categories.php
+++ b/core/Requirement/Prohibited_categories.php
@@ -193,12 +193,15 @@ private function get_list_categories($args = array('page' => 1, 'per_page' => 10
      */
     private function get_total_count($args = array('search' => '', 'hide_empty' => 0))
     {
-        $args_key = base64_encode($args['search']);
+        $args_key = hash('sha256', (string) $args['search']);
         $cache_key = 'total_prohib_category_count_' . $args_key;
 
         $total_categories = get_transient($cache_key);
         if ($total_categories === false) {
-            $total_categories = wp_count_terms('category', $args);
+            // get_terms() with 'fields' => 'count' works the same from WP 5.5 to current,
+            // unlike the two wp_count_terms() signatures.
+            $total_categories = get_terms(array_merge($args, ['taxonomy' => 'category', 'fields' => 'count']));
+            $total_categories = is_wp_error($total_categories) ? 0 : (int) $total_categories;
             set_transient($cache_key, $total_categories, $this->cache_expiration);
         }
 
diff --git a/core/Requirement/Prohibited_tags.php b/core/Requirement/Prohibited_tags.php
index ebfc58b1..fdb3c8ba 100644
--- a/core/Requirement/Prohibited_tags.php
+++ b/core/Requirement/Prohibited_tags.php
@@ -199,12 +199,15 @@ private function get_list_tags($args = array('page' => 1, 'per_page' => 10, 'q'
      */
     private function get_total_count($args = array('search' => '', 'hide_empty' => 0))
     {
-        $args_key = base64_encode($args['search']);
+        $args_key = hash('sha256', (string) $args['search']);
         $cache_key = 'total_prohib_tag_count_' . $args_key;
 
         $total_tags = get_transient($cache_key);
         if ($total_tags === false) {
-            $total_tags = wp_count_terms('post_tag', $args);
+            // get_terms() with 'fields' => 'count' works the same from WP 5.5 to current,
+            // unlike the two wp_count_terms() signatures.
+            $total_tags = get_terms(array_merge($args, ['taxonomy' => 'post_tag', 'fields' => 'count']));
+            $total_tags = is_wp_error($total_tags) ? 0 : (int) $total_tags;
             set_transient($cache_key, $total_tags, $this->cache_expiration);
         }
 
diff --git a/core/Requirement/Required_categories.php b/core/Requirement/Required_categories.php
index 6042d8b1..cde9b496 100644
--- a/core/Requirement/Required_categories.php
+++ b/core/Requirement/Required_categories.php
@@ -194,12 +194,15 @@ private function get_list_categories($args = array('page' => 1, 'per_page' => 10
      */
     private function get_total_count($args = array('search' => '', 'hide_empty' => 0))
     {
-        $args_key = base64_encode($args['search']);
+        $args_key = hash('sha256', (string) $args['search']);
         $cache_key = 'total_require_category_count_' . $args_key;
 
         $total_categories = get_transient($cache_key);
         if ($total_categories === false) {
-            $total_categories = wp_count_terms('category', $args);
+            // get_terms() with 'fields' => 'count' works the same from WP 5.5 to current,
+            // unlike the two wp_count_terms() signatures.
+            $total_categories = get_terms(array_merge($args, ['taxonomy' => 'category', 'fields' => 'count']));
+            $total_categories = is_wp_error($total_categories) ? 0 : (int) $total_categories;
             set_transient($cache_key, $total_categories, $this->cache_expiration);
         }
 
diff --git a/core/Requirement/Required_tags.php b/core/Requirement/Required_tags.php
index 697192a9..68a2ec9b 100644
--- a/core/Requirement/Required_tags.php
+++ b/core/Requirement/Required_tags.php
@@ -199,12 +199,15 @@ private function get_list_tags($args = array('page' => 1, 'per_page' => 10, 'q'
      */
     private function get_total_count($args = array('search' => '', 'hide_empty' => 0))
     {
-        $args_key = base64_encode($args['search']);
+        $args_key = hash('sha256', (string) $args['search']);
         $cache_key = 'total_required_tag_count_' . $args_key;
 
         $total_tags = get_transient($cache_key);
         if ($total_tags === false) {
-            $total_tags = wp_count_terms('post_tag', $args);
+            // get_terms() with 'fields' => 'count' works the same from WP 5.5 to current,
+            // unlike the two wp_count_terms() signatures.
+            $total_tags = get_terms(array_merge($args, ['taxonomy' => 'post_tag', 'fields' => 'count']));
+            $total_tags = is_wp_error($total_tags) ? 0 : (int) $total_tags;
             set_transient($cache_key, $total_tags, $this->cache_expiration);
         }
 
diff --git a/modules/checklists/checklists.php b/modules/checklists/checklists.php
index ad697390..a2693eb0 100644
--- a/modules/checklists/checklists.php
+++ b/modules/checklists/checklists.php
@@ -1662,7 +1662,7 @@ public function redirect_on_activate()
         {
             if (get_option('ppch_activated')) {
                 delete_option('ppch_activated');
-                wp_redirect(admin_url("admin.php?page=ppch-checklists"));
+                wp_safe_redirect(admin_url("admin.php?page=ppch-checklists"));
                 exit;
             }
         }
diff --git a/modules/checklists/templates/global-checklists.php b/modules/checklists/templates/global-checklists.php
index 888673ff..a048ca45 100644
--- a/modules/checklists/templates/global-checklists.php
+++ b/modules/checklists/templates/global-checklists.php
@@ -24,6 +24,31 @@
     <div class="pressshack-admin-wrapper pp-checklists-tabs-wrapper">
         <div class="pp-checklists-tabs">
             <?php
+            $allowed_svg_tags = [
+                'svg'  => [
+                    'aria-hidden' => true,
+                    'class'       => true,
+                    'focusable'   => true,
+                    'height'      => true,
+                    'role'        => true,
+                    'version'     => true,
+                    'viewbox'     => true,
+                    'width'       => true,
+                    'xmlns'       => true,
+                ],
+                'g'    => [
+                    'clip-rule' => true,
+                    'fill'      => true,
+                    'fill-rule' => true,
+                ],
+                'path' => [
+                    'clip-rule' => true,
+                    'd'         => true,
+                    'fill'      => true,
+                    'fill-rule' => true,
+                ],
+            ];
+
             /**
              * Render field tabs
              */
@@ -59,7 +84,7 @@
                                 data-post-type="<?php echo esc_attr($post_type_key); ?>"
                                 href="#">
                                 <span class="<?php echo esc_attr($args['icon']); ?>">
-                                    <?php if (isset($args['svg']) && !empty($args['svg'])) : echo $args['svg']; endif; ?>
+                                    <?php if (isset($args['svg']) && !empty($args['svg'])) : echo wp_kses($args['svg'], $allowed_svg_tags); endif; ?>
                                 </span>
                                 <span class="item"><?php echo esc_html($args['label']); ?></span>
                                 <?php if ($enabled_count > 0) : ?>
@@ -98,10 +123,10 @@
                     <tbody id="<?php echo 'pp-checklists-tab-body-' . esc_attr($post_type_key); ?>" class="pp-checklists-tab-body <?php echo $i === 0 ? 'active' : ''; ?>" style="display: none;">
                         <?php
                         foreach ($context['tabs'][$post_type_key] as $group => $tabInfo) :
-                            foreach ($context['requirements'] as $post_type => $post_type_requirements) : ?>
+                            foreach ($context['requirements'] as $requirements_post_type => $post_type_requirements) : ?>
                                 <?php
                                 // Skip if the post type is not the current one
-                                if ($post_type !== $post_type_key) continue;
+                                if ($requirements_post_type !== $post_type_key) continue;
                                 $group_has_requirements = false;
                                     foreach ($post_type_requirements as $requirement) :
                                         if ($requirement->group === $group) :
@@ -117,7 +142,7 @@
                                                 class="pp-checklists-requirement-row ppch-<?php echo esc_attr($requirement->group); ?>-group <?php echo $is_locked ? ' ppc-pro-locked-row' : ''; ?>"
                                                 style="display: none;"
                                                 data-id="<?php echo esc_attr($requirement->name); ?>"
-                                                data-post-type="<?php echo esc_attr($post_type); ?>">
+                                                data-post-type="<?php echo esc_attr($requirements_post_type); ?>">
                                                
                                                 <td>
                                                     <?php
@@ -137,7 +162,7 @@ class="pp-checklists-requirement-row ppch-<?php echo esc_attr($requirement->grou
                                                  *
                                                  * @return string
                                                  */
-                                                do_action('publishpress_checklists_tasks_list_td', $requirement, $post_type);
+                                                do_action('publishpress_checklists_tasks_list_td', $requirement, $requirements_post_type);
                                                 ?>
                                                 <td class="pp-checklists-task-params">
                                                     <?php
@@ -159,8 +184,8 @@ class="pp-checklists-requirement-row ppch-<?php echo esc_attr($requirement->grou
                                         endif;
                                     endforeach;
                                 ?>
-                                <?php if ($post_type === $post_type_key && !$group_has_requirements) : ?>
-                                    <tr class="pp-checklists-requirement-row ppch-<?php echo esc_attr($group); ?>-group" data-post-type="<?php echo esc_attr($post_type); ?>">
+                                <?php if ($requirements_post_type === $post_type_key && !$group_has_requirements) : ?>
+                                    <tr class="pp-checklists-requirement-row ppch-<?php echo esc_attr($group); ?>-group" data-post-type="<?php echo esc_attr($requirements_post_type); ?>">
                                         <td colspan="4" id="empty-custom-rule">
                                             <?php echo esc_html(sprintf(__('No %s requirements for this post type.', 'publishpress-checklists'), $group)); ?>
                                         </td>
diff --git a/modules/settings/settings.php b/modules/settings/settings.php
index d17f7fee..88b23779 100644
--- a/modules/settings/settings.php
+++ b/modules/settings/settings.php
@@ -1585,7 +1585,7 @@ public function settings_checklist_items_sort_order_option($args = [])
                 $hidden = $value === $sortValue ? '' : ' hidden';
                 echo '<p class="description ppch-sort-order-description"'
                     . ' data-sort-order="' . esc_attr($sortValue) . '"'
-                    . $hidden . '>';
+                    . esc_attr($hidden) . '>';
                 echo esc_html($sortDescription);
                 echo '</p>';
             }