diff --git a/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Front_End.php b/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Front_End.php
index <HASH>..<HASH> 100644
--- a/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Front_End.php
+++ b/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Front_End.php
@@ -292,9 +292,9 @@ class Pods_Templates_Auto_Template_Front_End {
 		if ( isset( $possible_pods[ $pod_name ] ) ) {
 			$this_pod = $possible_pods[ $pod_name ];
 
-			if ( is_singular() || is_single() ) {
+			if ( is_singular() || is_single() || ( 'taxonomy' === $this_pod['type'] && is_tax() ) ) ) {
 				$filter = pods_v( 'single_filter', $this_pod, $filter, true );
-			} elseif ( is_archive() || is_post_type_archive() || is_tax() || in_the_loop() ) {
+			} elseif ( $this_pod['has_archive'] && ( is_archive() || is_post_type_archive() || is_tax() || in_the_loop() ) ) {
 				$filter = pods_v( 'archive_filter', $this_pod, $filter, true );
 			}
 		}
More logic adjustments for taxonomies