Improve tag cloud count filter

category.php

@@ -55,6 +55,7 @@ get_header();
           <?php
             wp_tag_cloud(
               array(
+                'fictioneer_query_name' => 'tag_cloud',
                 'smallest' => 0.625,
                 'largest' => 1.25,
                 'unit' => 'rem',

includes/functions/_setup-wordpress.php

@@ -319,8 +319,14 @@ add_action( 'pre_get_posts', 'fictioneer_extend_taxonomy_pages' );
  * @return array Array of found terms with modified counts.
  */
 
-function fictioneer_exclude_non_stories_from_cloud_counts( $terms, $taxonomies ) {
+function fictioneer_exclude_non_stories_from_cloud_counts( $terms, $taxonomies, $args ) {
-  if ( ! is_tax() || is_admin() || empty( $terms ) || empty( $taxonomies ) ) {
+  if (
+    ! ( is_tax() || is_tag() || is_category() ) ||
+    is_admin() ||
+    empty( $terms ) ||
+    empty( $taxonomies ) ||
+    ( $args['fictioneer_query_name'] ?? 0 ) !== 'tag_cloud'
+  ) {
     return $terms;
   }
 
@@ -331,7 +337,12 @@ function fictioneer_exclude_non_stories_from_cloud_counts( $terms, $taxonomies )
 
   if ( ! empty( $matched_taxonomies ) ) {
     foreach ( $terms as &$term ) {
+      $term_ids = [];
+
+      if ( $args['pad_counts'] ?? 0 ) {
         $term_ids = get_term_children( $term->term_id, $term->taxonomy );
+      }
+
       $term_ids[] = $term->term_id;
 
       $count = $wpdb->get_var(

tag.php

@@ -63,6 +63,7 @@ get_header();
           <?php
             wp_tag_cloud(
               array(
+                'fictioneer_query_name' => 'tag_cloud',
                 'smallest' => .625,
                 'largest' => 1.25,
                 'unit' => 'rem',

taxonomy-fcn_character.php

@@ -64,6 +64,7 @@ get_header();
           <?php
             wp_tag_cloud(
               array(
+                'fictioneer_query_name' => 'tag_cloud',
                 'smallest' => .625,
                 'largest' => 1.25,
                 'unit' => 'rem',

taxonomy-fcn_content_warning.php

@@ -64,6 +64,7 @@ get_header();
           <?php
             wp_tag_cloud(
               array(
+                'fictioneer_query_name' => 'tag_cloud',
                 'smallest' => .625,
                 'largest' => 1.25,
                 'unit' => 'rem',

taxonomy-fcn_fandom.php

@@ -64,6 +64,7 @@ get_header();
           <?php
             wp_tag_cloud(
               array(
+                'fictioneer_query_name' => 'tag_cloud',
                 'smallest' => .625,
                 'largest' => 1.25,
                 'unit' => 'rem',

taxonomy-fcn_genre.php

@@ -64,6 +64,7 @@ get_header();
           <?php
             wp_tag_cloud(
               array(
+                'fictioneer_query_name' => 'tag_cloud',
                 'smallest' => .625,
                 'largest' => 1.25,
                 'unit' => 'rem',