diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
index fb6ed5179..02ea64bd6 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -38,11 +38,9 @@ internal class LanguageVmProfile : Profile
     {
         public LanguageVmProfile()
         {
-            CreateMap<Language, LanguageVm>()
-                .ForMember(l => l.FilterListIds,
-                    o => o.MapFrom(l =>
-                        l.FilterListLanguages.Select(fll => fll.FilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()));
+            CreateMap<Language, LanguageVm>().ForMember(l => l.FilterListIds,
+                o => o.MapFrom(l =>
+                    l.FilterListLanguages.OrderBy(fll => fll.FilterListId).Select(fll => fll.FilterListId)));
         }
     }
 
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
index 23edc6cdb..0d3159768 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
@@ -37,10 +37,8 @@ internal class LicenseVmProfile : Profile
     {
         public LicenseVmProfile()
         {
-            CreateMap<License, LicenseVm>()
-                .ForMember(l => l.FilterListIds,
-                    o => o.MapFrom(l =>
-                        l.FilterLists.Select(fl => fl.Id).OrderBy(flid => flid).AsEnumerable()));
+            CreateMap<License, LicenseVm>().ForMember(l => l.FilterListIds,
+                o => o.MapFrom(l => l.FilterLists.OrderBy(fl => fl.Id).Select(fl => fl.Id)));
         }
     }
 
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
index 30e592eae..514bf83ea 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
@@ -50,44 +50,42 @@ public ListDetailsVmProfile()
             CreateMap<FilterList, ListDetailsVm>()
                 .ForMember(fl => fl.SyntaxIds,
                     o => o.MapFrom(fl =>
-                        fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid).AsEnumerable()))
+                        fl.FilterListSyntaxes.OrderBy(fls => fls.SyntaxId).Select(fls => fls.SyntaxId)))
                 .ForMember(fl => fl.Iso6391s,
                     o => o.MapFrom(fl =>
-                        fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i).AsEnumerable()))
+                        fl.FilterListLanguages.OrderBy(fll => fll.Iso6391).Select(fll => fll.Iso6391)))
                 .ForMember(fl => fl.TagIds,
                     o => o.MapFrom(fl =>
-                        fl.FilterListTags.Select(flt => flt.TagId).OrderBy(tid => tid).AsEnumerable()))
+                        fl.FilterListTags.OrderBy(flt => flt.TagId).Select(flt => flt.TagId)))
                 .ForMember(fl => fl.ViewUrls,
                     o => o.MapFrom(fl =>
-                        fl.ViewUrls.OrderBy(u => u.SegmentNumber).ThenBy(u => u.Primariness).AsEnumerable()))
+                        fl.ViewUrls.OrderBy(u => u.SegmentNumber).ThenBy(u => u.Primariness)))
                 .ForMember(fl => fl.MaintainerIds,
                     o => o.MapFrom(fl =>
-                        fl.FilterListMaintainers.Select(flm => flm.MaintainerId).OrderBy(mid => mid)
-                            .AsEnumerable()))
+                        fl.FilterListMaintainers.OrderBy(flm => flm.MaintainerId).Select(flm => flm.MaintainerId)))
                 .ForMember(fl => fl.UpstreamFilterListIds,
                     o => o.MapFrom(fl =>
-                        fl.UpstreamFilterLists.Select(ufl => ufl.UpstreamFilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()))
+                        fl.UpstreamFilterLists.OrderBy(f => f.UpstreamFilterListId)
+                            .Select(f => f.UpstreamFilterListId)))
                 .ForMember(fl => fl.ForkFilterListIds,
                     o => o.MapFrom(fl =>
-                        fl.ForkFilterLists.Select(ffl => ffl.ForkFilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()))
+                        fl.ForkFilterLists.OrderBy(f => f.ForkFilterListId).Select(f => f.ForkFilterListId)))
                 .ForMember(fl => fl.IncludedInFilterListIds,
                     o => o.MapFrom(fl =>
-                        fl.IncludedInFilterLists.Select(iifl => iifl.IncludedInFilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()))
+                        fl.IncludedInFilterLists.OrderBy(m => m.IncludedInFilterListId)
+                            .Select(m => m.IncludedInFilterListId)))
                 .ForMember(fl => fl.IncludesFilterListIds,
                     o => o.MapFrom(fl =>
-                        fl.IncludesFilterLists.Select(ifl => ifl.IncludesFilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()))
+                        fl.IncludesFilterLists.OrderBy(m => m.IncludesFilterListId)
+                            .Select(m => m.IncludesFilterListId)))
                 .ForMember(fl => fl.DependencyFilterListIds,
                     o => o.MapFrom(fl =>
-                        fl.DependencyFilterLists.Select(dfl => dfl.DependencyFilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()))
+                        fl.DependencyFilterLists.OrderBy(d => d.DependencyFilterListId)
+                            .Select(d => d.DependencyFilterListId)))
                 .ForMember(fl => fl.DependentFilterListIds,
                     o => o.MapFrom(fl =>
-                        fl.DependentFilterLists.Select(dfl => dfl.DependentFilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()));
+                        fl.DependentFilterLists.OrderBy(d => d.DependentFilterListId)
+                            .Select(d => d.DependentFilterListId)));
 
             CreateMap<FilterListViewUrl, ListDetailsVm.ViewUrlVm>();
         }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
index 5492f7bb6..e76219ece 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
@@ -41,21 +41,20 @@ public ListVmProfile()
             CreateMap<FilterList, ListVm>()
                 .ForMember(fl => fl.SyntaxIds,
                     o => o.MapFrom(fl =>
-                        fl.FilterListSyntaxes.Select(fls => fls.SyntaxId).OrderBy(sid => sid).AsEnumerable()))
+                        fl.FilterListSyntaxes.OrderBy(fls => fls.SyntaxId).Select(fls => fls.SyntaxId)))
                 .ForMember(fl => fl.Iso6391s,
                     o => o.MapFrom(fl =>
-                        fl.FilterListLanguages.Select(fls => fls.Iso6391).OrderBy(i => i).AsEnumerable()))
+                        fl.FilterListLanguages.OrderBy(fll => fll.Iso6391).Select(fll => fll.Iso6391)))
                 .ForMember(fl => fl.TagIds,
                     o => o.MapFrom(fl =>
-                        fl.FilterListTags.Select(flt => flt.TagId).OrderBy(tid => tid).AsEnumerable()))
+                        fl.FilterListTags.OrderBy(flt => flt.TagId).Select(flt => flt.TagId)))
                 .ForMember(fl => fl.PrimaryViewUrl,
                     o => o.MapFrom(fl =>
                         fl.ViewUrls.OrderBy(u => u.SegmentNumber).ThenBy(u => u.Primariness).Select(u => u.Url)
                             .FirstOrDefault()))
                 .ForMember(fl => fl.MaintainerIds,
                     o => o.MapFrom(fl =>
-                        fl.FilterListMaintainers.Select(flm => flm.MaintainerId).OrderBy(mid => mid)
-                            .AsEnumerable()));
+                        fl.FilterListMaintainers.OrderBy(flm => flm.MaintainerId).Select(flm => flm.MaintainerId)));
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
index 2aa4d47c2..500d89079 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
@@ -40,8 +40,7 @@ public MaintainerVmProfile()
             CreateMap<Maintainer, MaintainerVm>()
                 .ForMember(m => m.FilterListIds,
                     o => o.MapFrom(m =>
-                        m.FilterListMaintainers.Select(flm => flm.FilterListId).OrderBy(flid => flid)
-                            .AsEnumerable()));
+                        m.FilterListMaintainers.OrderBy(flm => flm.FilterListId).Select(flm => flm.FilterListId)));
         }
     }
 
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
index 3a79a559f..463979ad9 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
@@ -39,8 +39,7 @@ public SoftwareVmProfile()
         {
             CreateMap<Software, SoftwareVm>()
                 .ForMember(s => s.SyntaxIds,
-                    o => o.MapFrom(s =>
-                        s.SoftwareSyntaxes.Select(ss => ss.SyntaxId).OrderBy(sid => sid).AsEnumerable()));
+                    o => o.MapFrom(s => s.SoftwareSyntaxes.OrderBy(ss => ss.SyntaxId).Select(ss => ss.SyntaxId)));
         }
     }
 
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
index 773f58e0f..10eef6c7d 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
@@ -40,10 +40,10 @@ public SyntaxVmProfile()
             CreateMap<Syntax, SyntaxVm>()
                 .ForMember(s => s.FilterListIds,
                     o => o.MapFrom(s =>
-                        s.FilterListSyntaxes.Select(sls => sls.FilterListId).OrderBy(flid => flid).AsEnumerable()))
+                        s.FilterListSyntaxes.OrderBy(fls => fls.FilterListId).Select(sls => sls.FilterListId)))
                 .ForMember(s => s.SoftwareIds,
                     o => o.MapFrom(s =>
-                        s.SoftwareSyntaxes.Select(ss => ss.SoftwareId).OrderBy(sid => sid).AsEnumerable()));
+                        s.SoftwareSyntaxes.OrderBy(ss => ss.SoftwareId).Select(ss => ss.SoftwareId)));
         }
     }
 
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
index 5e53674c5..3424c9e1f 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
@@ -40,7 +40,7 @@ public TagVmProfile()
             CreateMap<Tag, TagVm>()
                 .ForMember(t => t.FilterListIds,
                     o => o.MapFrom(t =>
-                        t.FilterListTags.Select(flt => flt.FilterListId).OrderBy(flid => flid).AsEnumerable()));
+                        t.FilterListTags.OrderBy(flt => flt.FilterListId).Select(flt => flt.FilterListId)));
         }
     }