diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
index 7af125a05..e5f59e486 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs
@@ -33,7 +33,7 @@ public async Task<IEnumerable<LanguageVm>> Handle(
                 CancellationToken cancellationToken)
             {
                 return await _context.Languages
-                    .Where(l => l.FilterListLanguages.Count > 0)
+                    .Where(l => l.FilterListLanguages.Any())
                     .OrderBy(l => l.Iso6391)
                     .ProjectTo<LanguageVm>(_mapper.ConfigurationProvider)
                     .ToListAsync(cancellationToken);
@@ -54,9 +54,9 @@ public LanguageVmProfile()
 
         public class LanguageVm
         {
-            public string Iso6391 { get; } = null!;
-            public string Name { get; } = null!;
-            public IEnumerable<int>? FilterListIds { get; }
+            public string Iso6391 { get; private set; } = null!;
+            public string Name { get; private set; } = null!;
+            public IEnumerable<int>? FilterListIds { get; private set; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
index db02780d4..0ec56b8bf 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs
@@ -53,13 +53,13 @@ public LicenseVmProfile()
 
         public class LicenseVm
         {
-            public int Id { get; }
-            public string Name { get; } = null!;
-            public Uri? Url { get; }
-            public bool PermitsModification { get; }
-            public bool PermitsDistribution { get; }
-            public bool PermitsCommercialUse { get; }
-            public IEnumerable<int>? FilterListIds { get; }
+            public int Id { get; private set; }
+            public string Name { get; private set; } = null!;
+            public Uri? Url { get; private set; }
+            public bool PermitsModification { get; private set; }
+            public bool PermitsDistribution { get; private set; }
+            public bool PermitsCommercialUse { get; private set; }
+            public IEnumerable<int>? FilterListIds { get; private set; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
index 70c164ca4..94a39d5b9 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs
@@ -54,12 +54,12 @@ public MaintainerVmProfile()
 
         public class MaintainerVm
         {
-            public int Id { get; }
-            public string Name { get; } = null!;
-            public Uri? Url { get; }
-            public string? EmailAddress { get; }
-            public string? TwitterHandle { get; }
-            public IEnumerable<int>? FilterListIds { get; }
+            public int Id { get; private set; }
+            public string Name { get; private set; } = null!;
+            public Uri? Url { get; private set; }
+            public string? EmailAddress { get; private set; }
+            public string? TwitterHandle { get; private set; }
+            public IEnumerable<int>? FilterListIds { get; private set; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
index 86e664b7d..e8b2feeed 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSoftware.cs
@@ -53,13 +53,13 @@ public SoftwareVmProfile()
 
         public class SoftwareVm
         {
-            public int Id { get; }
-            public string Name { get; } = null!;
-            public string? Description { get; }
-            public Uri? HomeUrl { get; }
-            public Uri? DownloadUrl { get; }
-            public bool SupportsAbpUrlScheme { get; }
-            public IEnumerable<int>? SyntaxIds { get; }
+            public int Id { get; private set; }
+            public string Name { get; private set; } = null!;
+            public string? Description { get; private set; }
+            public Uri? HomeUrl { get; private set; }
+            public Uri? DownloadUrl { get; private set; }
+            public bool SupportsAbpUrlScheme { get; private set; }
+            public IEnumerable<int>? SyntaxIds { get; private set; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
index 2e16053eb..b5aa12e4c 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs
@@ -56,12 +56,12 @@ public SyntaxVmProfile()
 
         public class SyntaxVm
         {
-            public int Id { get; }
-            public string Name { get; } = null!;
-            public string? Description { get; }
-            public Uri? Url { get; }
-            public IEnumerable<int>? FilterListIds { get; }
-            public IEnumerable<int>? SoftwareIds { get; }
+            public int Id { get; private set; }
+            public string Name { get; private set; } = null!;
+            public string? Description { get; private set; }
+            public Uri? Url { get; private set; }
+            public IEnumerable<int>? FilterListIds { get; private set; }
+            public IEnumerable<int>? SoftwareIds { get; private set; }
         }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
index 63c602c77..610e3cf62 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs
@@ -52,10 +52,10 @@ public TagVmProfile()
 
         public class TagVm
         {
-            public int Id { get; }
-            public string Name { get; } = null!;
-            public string? Description { get; }
-            public IEnumerable<int>? FilterListIds { get; }
+            public int Id { get; private set; }
+            public string Name { get; private set; } = null!;
+            public string? Description { get; private set; }
+            public IEnumerable<int>? FilterListIds { get; private set; }
         }
     }
 }