diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
index 3c7e365dd..ea1017b1c 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetLanguages
 {
-    public class Query : IRequest<IEnumerable<LanguageVm>>
+    public class Query : IRequest<List<LanguageVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<LanguageVm>>
+    internal class Handler : IRequestHandler<Query, List<LanguageVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -24,11 +24,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<LanguageVm>> Handle(
+        public Task<List<LanguageVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.Languages
+            return _context.Languages
                 .Where(l => l.FilterListLanguages.Any())
                 .OrderBy(l => l.Iso6391)
                 .ProjectTo<LanguageVm>(_mapper.ConfigurationProvider)
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
index 2951c0061..b4c6d0872 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetLicenses
 {
-    public class Query : IRequest<IEnumerable<LicenseVm>>
+    public class Query : IRequest<List<LicenseVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<LicenseVm>>
+    internal class Handler : IRequestHandler<Query, List<LicenseVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -24,11 +24,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<LicenseVm>> Handle(
+        public Task<List<LicenseVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.Licenses
+            return _context.Licenses
                 .OrderBy(l => l.Id)
                 .ProjectTo<LicenseVm>(_mapper.ConfigurationProvider)
                 .ToListAsync(cancellationToken);
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
index 5dfd317d8..66de05048 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
@@ -31,11 +31,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<ListDetailsVm?> Handle(
+        public Task<ListDetailsVm?> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.FilterLists
+            return _context.FilterLists
                 .ProjectTo<ListDetailsVm>(_mapper.ConfigurationProvider)
                 .SingleOrDefaultAsync(fl => fl.Id == request.Id, cancellationToken);
         }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
index fc3f83f09..c9645429a 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLists.cs
@@ -10,11 +10,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetLists
 {
-    public class Query : IRequest<IEnumerable<ListVm>>
+    public class Query : IRequest<List<ListVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<ListVm>>
+    internal class Handler : IRequestHandler<Query, List<ListVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -25,11 +25,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<ListVm>> Handle(
+        public Task<List<ListVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.FilterLists
+            return _context.FilterLists
                 .OrderBy(fl => fl.Id)
                 .ProjectTo<ListVm>(_mapper.ConfigurationProvider)
                 .ToListAsync(cancellationToken);
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
index 6d0154ab5..7d720c904 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetMaintainers
 {
-    public class Query : IRequest<IEnumerable<MaintainerVm>>
+    public class Query : IRequest<List<MaintainerVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<MaintainerVm>>
+    internal class Handler : IRequestHandler<Query, List<MaintainerVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -24,11 +24,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<MaintainerVm>> Handle(
+        public Task<List<MaintainerVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.Maintainers
+            return _context.Maintainers
                 .OrderBy(m => m.Id)
                 .ProjectTo<MaintainerVm>(_mapper.ConfigurationProvider)
                 .ToListAsync(cancellationToken);
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
index c8ee8f1cf..97b2e9c00 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetSoftware
 {
-    public class Query : IRequest<IEnumerable<SoftwareVm>>
+    public class Query : IRequest<List<SoftwareVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<SoftwareVm>>
+    internal class Handler : IRequestHandler<Query, List<SoftwareVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -24,11 +24,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<SoftwareVm>> Handle(
+        public Task<List<SoftwareVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.Software
+            return _context.Software
                 .OrderBy(s => s.Id)
                 .ProjectTo<SoftwareVm>(_mapper.ConfigurationProvider)
                 .ToListAsync(cancellationToken);
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
index 40db5cac6..8739c1ce8 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetSyntaxes
 {
-    public class Query : IRequest<IEnumerable<SyntaxVm>>
+    public class Query : IRequest<List<SyntaxVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<SyntaxVm>>
+    internal class Handler : IRequestHandler<Query, List<SyntaxVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -24,11 +24,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<SyntaxVm>> Handle(
+        public Task<List<SyntaxVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.Syntaxes
+            return _context.Syntaxes
                 .OrderBy(s => s.Id)
                 .ProjectTo<SyntaxVm>(_mapper.ConfigurationProvider)
                 .ToListAsync(cancellationToken);
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
index 3f3410deb..920c2cc5d 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Application.Queries;
 
 public static class GetTags
 {
-    public class Query : IRequest<IEnumerable<TagVm>>
+    public class Query : IRequest<List<TagVm>>
     {
     }
 
-    internal class Handler : IRequestHandler<Query, IEnumerable<TagVm>>
+    internal class Handler : IRequestHandler<Query, List<TagVm>>
     {
         private readonly IQueryContext _context;
         private readonly IMapper _mapper;
@@ -24,11 +24,11 @@ public Handler(IQueryContext context, IMapper mapper)
             _mapper = mapper;
         }
 
-        public async Task<IEnumerable<TagVm>> Handle(
+        public Task<List<TagVm>> Handle(
             Query request,
             CancellationToken cancellationToken)
         {
-            return await _context.Tags
+            return _context.Tags
                 .OrderBy(t => t.Id)
                 .ProjectTo<TagVm>(_mapper.ConfigurationProvider)
                 .ToListAsync(cancellationToken);