diff --git a/components/filters/tags.vue b/components/filters/tags.vue
index 4f41249..e28980d 100644
--- a/components/filters/tags.vue
+++ b/components/filters/tags.vue
@@ -12,6 +12,7 @@
 				<Icon icon="search" />
 			</label>
 
+			<!--
 			<div
 				v-show="showActorTags"
 				v-tooltip="'Tags relevant to the selected actors'"
@@ -29,6 +30,7 @@
 			>
 				<Icon icon="price-tags" />
 			</div>
+			-->
 
 			<div
 				v-show="order === 'priority'"
@@ -140,12 +142,13 @@ const props = defineProps({
 const emit = defineEmits(['update']);
 
 const { pageProps } = inject('pageContext');
-const { tag: pageTag, actor: pageActor } = pageProps;
+// const { tag: pageTag, actor: pageActor } = pageProps;
+const { tag: pageTag } = pageProps;
 
 const search = ref('');
 const searchRegexp = computed(() => new RegExp(search.value, 'i'));
 const order = ref('priority');
-const showActorTags = ref(true);
+// const showActorTags = ref(true);
 
 const priorityTags = [
 	'anal',
@@ -169,9 +172,12 @@ const priorityTags = [
 ];
 
 const groupedTags = computed(() => {
+	/*
 	const tags = showActorTags.value && props.actorTags && (props.filters.actors.length > 0 || pageActor)
 		? props.actorTags
 		: props.tags;
+	*/
+	const tags = props.tags;
 
 	const selected = tags.filter((tag) => props.filters.tags.includes(tag.slug));
 	const filtered = tags.filter((tag) => !props.filters.tags.includes(tag.slug)
diff --git a/src/scenes.js b/src/scenes.js
index 30dba4e..fb94261 100644
--- a/src/scenes.js
+++ b/src/scenes.js
@@ -432,7 +432,6 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		:yearsFacet:
 		:actorsFacet:
 		:tagsFacet:
-		:actorTagsFacet:
 		:channelsFacet:
 		:studiosFacet:;
 		show meta;
@@ -466,10 +465,12 @@ async function queryManticoreSql(filters, options, _reqUser) {
 						weight() as _score
 					`));
 
+					/*
 					// manticore only supports one joined table, so we can't use it inside stashes; probably not needed anyway (stashes only need global tags?)
 					builder
 						.leftJoin('scenes_tags', 'scenes_tags.scene_id', 'scenes_.id')
 						.groupBy('scenes.id');
+					*/
 				}
 
 				if (filters.query) {
@@ -576,9 +577,11 @@ async function queryManticoreSql(filters, options, _reqUser) {
 		actorsFacet: options.aggregateActors ? knex.raw('facet scenes.actor_ids as actors_facet distinct id order by count(distinct id) desc limit ?', [aggSize]) : null,
 		// don't facet tags associated to other actors, actor ID 0 means global
 		tagsFacet: options.aggregateTags ? knex.raw('facet scenes.tag_ids as tags_facet order by count(distinct id) desc limit ?', [aggSize]) : null,
+		/*
 		actorTagsFacet: options.aggregateTags && !filters.stashId // eslint-disable-line no-nested-ternary
 			? knex.raw(`facet IF(IN(scenes_tags.actor_id, ${[0, ...filters?.actorIds || []]}), scenes_tags.tag_id, 0) as actor_tags_facet distinct id order by count(distinct id) desc limit ?`, [aggSize])
 			: null,
+		*/
 		channelsFacet: options.aggregateChannels ? knex.raw('facet scenes.channel_id as channels_facet distinct id order by count(distinct id) desc limit ?', [aggSize]) : null,
 		studiosFacet: options.aggregateChannels ? knex.raw('facet scenes.studio_id as studios_facet distinct id order by count(distinct id) desc limit ?', [aggSize]) : null,
 		maxMatches: config.database.manticore.maxMatches,