diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs
index 5f7d1bce7..25fcee2dc 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/AggregateRoot.cs
@@ -16,5 +16,6 @@ public virtual void Configure(EntityTypeBuilder<TAggregateRoot> builder)
         builder.Property(e => e.IsApproved)
             .IsRequired()
             .HasDefaultValue(true); // legacy json data approved via GitHub PR
+        builder.HasQueryFilter(e => e.IsApproved == true);
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
index 5954dc79d..201c9eb12 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs
@@ -30,6 +30,7 @@ public virtual void Configure(EntityTypeBuilder<Dependent> builder)
             .WithMany(fl => fl.DependencyFilterLists)
             .HasForeignKey(d => d.DependentFilterListId)
             .HasConstraintName("fk_dependents_filter_lists_dependent_filter_list_id");
+        builder.HasQueryFilter(d => d.DependencyFilterList.IsApproved == true && d.DependentFilterList.IsApproved == true);
         builder.HasDataJsonFile<Dependent>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
index df98d292f..2fa77f99f 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs
@@ -26,6 +26,7 @@ public virtual void Configure(EntityTypeBuilder<FilterListLanguage> builder)
             .WithMany(l => l.FilterListLanguages)
             .HasForeignKey(fll => fll.Iso6391)
             .HasConstraintName("fk_filter_list_languages_languages_iso6391");
+        builder.HasQueryFilter(fll => fll.FilterList.IsApproved == true && fll.Language.IsApproved == true);
         builder.HasDataJsonFile<FilterListLanguage>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
index 0fcb85659..749258397 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs
@@ -22,6 +22,7 @@ public virtual void Configure(EntityTypeBuilder<FilterListMaintainer> builder)
 
         builder.ToTable($"{nr.RewriteName(nameof(FilterListMaintainer))}s");
         builder.HasKey(flm => new { flm.FilterListId, flm.MaintainerId });
+        builder.HasQueryFilter(flm => flm.FilterList.IsApproved == true && flm.Maintainer.IsApproved == true);
         builder.HasDataJsonFile<FilterListMaintainer>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
index ac27ec1bf..763544ca5 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs
@@ -22,6 +22,7 @@ public virtual void Configure(EntityTypeBuilder<FilterListSyntax> builder)
 
         builder.ToTable($"{nr.RewriteName(nameof(FilterListSyntax))}es");
         builder.HasKey(fls => new { fls.FilterListId, fls.SyntaxId });
+        builder.HasQueryFilter(fls => fls.FilterList.IsApproved == true && fls.Syntax.IsApproved == true);
         builder.HasDataJsonFile<FilterListSyntax>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
index 65f14c61d..24a64e85f 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs
@@ -22,6 +22,7 @@ public virtual void Configure(EntityTypeBuilder<FilterListTag> builder)
 
         builder.ToTable($"{nr.RewriteName(nameof(FilterListTag))}s");
         builder.HasKey(flt => new { flt.FilterListId, flt.TagId });
+        builder.HasQueryFilter(flt => flt.FilterList.IsApproved == true && flt.Tag.IsApproved == true);
         builder.HasDataJsonFile<FilterListTag>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
index 5ac0181e7..43fd336fb 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs
@@ -30,6 +30,7 @@ public virtual void Configure(EntityTypeBuilder<Fork> builder)
             .WithMany(fl => fl.UpstreamFilterLists)
             .HasForeignKey(f => f.ForkFilterListId)
             .HasConstraintName("fk_forks_filter_lists_fork_filter_list_id");
+        builder.HasQueryFilter(f => f.UpstreamFilterList.IsApproved == true && f.ForkFilterList.IsApproved == true);
         builder.HasDataJsonFile<Fork>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
index b9af0b802..dbac06b07 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs
@@ -30,6 +30,7 @@ public virtual void Configure(EntityTypeBuilder<Merge> builder)
             .WithMany(fl => fl.IncludedInFilterLists)
             .HasForeignKey(m => m.IncludesFilterListId)
             .HasConstraintName("fk_merges_filter_lists_includes_filter_list_id");
+        builder.HasQueryFilter(m => m.IncludedInFilterList.IsApproved == true && m.IncludesFilterList.IsApproved == true);
         builder.HasDataJsonFile<Merge>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
index 7683f99c0..2312e5c29 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs
@@ -22,6 +22,7 @@ public virtual void Configure(EntityTypeBuilder<SoftwareSyntax> builder)
 
         builder.ToTable($"{nr.RewriteName(nameof(SoftwareSyntax))}es");
         builder.HasKey(ss => new { ss.SoftwareId, ss.SyntaxId });
+        builder.HasQueryFilter(ss => ss.Software.IsApproved == true && ss.Syntax.IsApproved == true);
         builder.HasDataJsonFile<SoftwareSyntax>();
     }
 }