diff --git a/src/FilterLists.Services/FilterList/FilterListService.cs b/src/FilterLists.Services/FilterList/FilterListService.cs
index 2c1b8d6c1..3fbe72df7 100644
--- a/src/FilterLists.Services/FilterList/FilterListService.cs
+++ b/src/FilterLists.Services/FilterList/FilterListService.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
@@ -18,14 +17,13 @@ public FilterListService(FilterListsDbContext dbContext, IConfigurationProvider
 
         public async Task<IEnumerable<List>> GetAllAsync() =>
             await DbContext.FilterLists
-                           .OrderBy(l => l.Name)
                            .ProjectTo<List>(MapConfig)
                            .ToListAsync();
 
         public async Task<ListDetails> GetDetailsAsync(int id) =>
             await DbContext.FilterLists
                            .ProjectTo<ListDetails>(MapConfig)
-                           .FirstOrDefaultAsync(x => x.Id == id)
+                           .FirstOrDefaultAsync(l => l.Id == id)
                            .FilterParentListFromMaintainerAdditionalLists();
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Language/LanguageService.cs b/src/FilterLists.Services/Language/LanguageService.cs
index e7ac04e68..dc60d4ab5 100644
--- a/src/FilterLists.Services/Language/LanguageService.cs
+++ b/src/FilterLists.Services/Language/LanguageService.cs
@@ -22,8 +22,7 @@ public LanguageService(FilterListsDbContext dbContext, IConfigurationProvider ma
             DbContext.Languages.Where(l => l.FilterListLanguages.Any());
 
         public async Task<IEnumerable<LanguageDto>> GetAllTargetedAsync() =>
-            await TargetedLanguages.OrderBy(s => s.Name)
-                                   .ProjectTo<LanguageDto>(MapConfig)
+            await TargetedLanguages.ProjectTo<LanguageDto>(MapConfig)
                                    .ToListAsync();
 
         public async Task<LanguageDto> GetTargetedByIdAsync(int id) =>
diff --git a/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs b/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs
index 821fcec0a..ff2c38f3a 100644
--- a/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs
+++ b/src/FilterLists.Services/Language/MappingProfiles/LanguageDtoMappingProfile.cs
@@ -1,4 +1,5 @@
-using AutoMapper;
+using System.Linq;
+using AutoMapper;
 using FilterLists.Services.Language.Models;
 using JetBrains.Annotations;
 
@@ -11,6 +12,10 @@ public LanguageDtoMappingProfile() =>
             CreateMap<Data.Entities.Language, LanguageDto>()
                 .ForMember(dest => dest.Id,
                     opt => opt.MapFrom(src =>
-                        (int)src.Id));
+                        (int)src.Id))
+                .ForMember(dest => dest.FilterListIds,
+                    opt => opt.MapFrom(src =>
+                        src.FilterListLanguages
+                           .Select(fl => (int)fl.FilterListId)));
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Language/Models/LanguageDto.cs b/src/FilterLists.Services/Language/Models/LanguageDto.cs
index be918c69a..c97dafa0c 100644
--- a/src/FilterLists.Services/Language/Models/LanguageDto.cs
+++ b/src/FilterLists.Services/Language/Models/LanguageDto.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace FilterLists.Services.Language.Models
 {
@@ -6,6 +7,7 @@ namespace FilterLists.Services.Language.Models
     public class LanguageDto
     {
         public int Id { get; set; }
+        public List<int> FilterListIds { get; set; }
         public string Iso6391 { get; set; }
         public string Name { get; set; }
     }
diff --git a/src/FilterLists.Services/License/LicenseService.cs b/src/FilterLists.Services/License/LicenseService.cs
index a82cd5424..5d1cff688 100644
--- a/src/FilterLists.Services/License/LicenseService.cs
+++ b/src/FilterLists.Services/License/LicenseService.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
@@ -20,7 +19,6 @@ public LicenseService(FilterListsDbContext dbContext, IConfigurationProvider map
 
         public async Task<IEnumerable<LicenseDto>> GetAllAsync() =>
             await DbContext.Licenses
-                           .OrderBy(s => s.Name)
                            .ProjectTo<LicenseDto>(MapConfig)
                            .ToListAsync();
 
diff --git a/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs b/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs
index d5a508c6a..9f28e9902 100644
--- a/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs
+++ b/src/FilterLists.Services/License/MappingProfiles/LicenseDtoMappingProfile.cs
@@ -1,4 +1,5 @@
-using AutoMapper;
+using System.Linq;
+using AutoMapper;
 using FilterLists.Services.License.Models;
 using JetBrains.Annotations;
 
@@ -11,6 +12,10 @@ public LicenseDtoMappingProfile() =>
             CreateMap<Data.Entities.License, LicenseDto>()
                 .ForMember(dest => dest.Id,
                     opt => opt.MapFrom(src =>
-                        (int)src.Id));
+                        (int)src.Id))
+                .ForMember(dest => dest.FilterListIds,
+                    opt => opt.MapFrom(src =>
+                        src.FilterLists
+                           .Select(l => (int)l.Id)));
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/License/Models/LicenseDto.cs b/src/FilterLists.Services/License/Models/LicenseDto.cs
index 43ccd6dea..7b6d42169 100644
--- a/src/FilterLists.Services/License/Models/LicenseDto.cs
+++ b/src/FilterLists.Services/License/Models/LicenseDto.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace FilterLists.Services.License.Models
 {
@@ -7,6 +8,7 @@ public class LicenseDto
     {
         public int Id { get; set; }
         public string DescriptionUrl { get; set; }
+        public List<int> FilterListIds { get; set; }
         public string Name { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Maintainer/MaintainerService.cs b/src/FilterLists.Services/Maintainer/MaintainerService.cs
index 7068fbabb..f2dca958f 100644
--- a/src/FilterLists.Services/Maintainer/MaintainerService.cs
+++ b/src/FilterLists.Services/Maintainer/MaintainerService.cs
@@ -25,6 +25,6 @@ await DbContext.Maintainers
         public async Task<MaintainerDto> GetByIdAsync(int id) =>
             await DbContext.Maintainers
                            .ProjectTo<MaintainerDto>(MapConfig)
-                           .FirstOrDefaultAsync(l => l.Id == id);
+                           .FirstOrDefaultAsync(m => m.Id == id);
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Seed/SeedService.cs b/src/FilterLists.Services/Seed/SeedService.cs
index dbb7e1488..3ca63c3a6 100644
--- a/src/FilterLists.Services/Seed/SeedService.cs
+++ b/src/FilterLists.Services/Seed/SeedService.cs
@@ -19,15 +19,15 @@ public SeedService(FilterListsDbContext dbContext, IConfigurationProvider mapCon
         }
 
         public async Task<IEnumerable<TSeedDto>> GetAllAsync<TEntity, TSeedDto>() where TEntity : class =>
-            await DbContext.Set<TEntity>().ProjectTo<TSeedDto>(MapConfig).ToArrayAsync();
+            await DbContext.Set<TEntity>().ProjectTo<TSeedDto>(MapConfig).ToListAsync();
 
         public async Task<IEnumerable<TSeedDto>> GetAllAsync<TEntity, TSeedDto>(PropertyInfo primarySort,
             PropertyInfo secondarySort)
             where TEntity : class =>
             await DbContext.Set<TEntity>()
-                           .OrderBy(x => primarySort.GetValue(x, null))
-                           .ThenBy(x => secondarySort.GetValue(x, null))
+                           .OrderBy(s => primarySort.GetValue(s, null))
+                           .ThenBy(s => secondarySort.GetValue(s, null))
                            .ProjectTo<TSeedDto>(MapConfig)
-                           .ToArrayAsync();
+                           .ToListAsync();
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs b/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs
index ef9654e97..f0a8cfb37 100644
--- a/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs
+++ b/src/FilterLists.Services/Software/MappingProfiles/SoftwareDtoMappingProfile.cs
@@ -3,7 +3,7 @@
 using FilterLists.Services.Software.Models;
 using JetBrains.Annotations;
 
-namespace FilterLists.Services.FilterList.MappingProfiles
+namespace FilterLists.Services.Software.MappingProfiles
 {
     [UsedImplicitly]
     public class SoftwareDtoMappingProfile : Profile
@@ -15,6 +15,7 @@ public SoftwareDtoMappingProfile() =>
                         (int)src.Id))
                 .ForMember(dest => dest.SyntaxIds,
                     opt => opt.MapFrom(src =>
-                        src.SoftwareSyntaxes.Select(ss => (int)ss.SyntaxId)));
+                        src.SoftwareSyntaxes
+                           .Select(ss => (int)ss.SyntaxId)));
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Software/Models/SoftwareDto.cs b/src/FilterLists.Services/Software/Models/SoftwareDto.cs
index 6f367b64f..e61ad89a2 100644
--- a/src/FilterLists.Services/Software/Models/SoftwareDto.cs
+++ b/src/FilterLists.Services/Software/Models/SoftwareDto.cs
@@ -7,6 +7,8 @@ namespace FilterLists.Services.Software.Models
     public class SoftwareDto
     {
         public int Id { get; set; }
+        public string HomeUrl { get; set; }
+        public bool IsAbpSubscribable { get; set; }
         public string Name { get; set; }
         public List<int> SyntaxIds { get; set; }
     }
diff --git a/src/FilterLists.Services/Software/SoftwareService.cs b/src/FilterLists.Services/Software/SoftwareService.cs
index 8dfad1c58..feb4af3af 100644
--- a/src/FilterLists.Services/Software/SoftwareService.cs
+++ b/src/FilterLists.Services/Software/SoftwareService.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
@@ -20,7 +19,6 @@ public SoftwareService(FilterListsDbContext dbContext, IConfigurationProvider ma
 
         public async Task<IEnumerable<SoftwareDto>> GetAll() =>
             await DbContext.Software
-                           .OrderBy(s => s.Name)
                            .ProjectTo<SoftwareDto>(MapConfig)
                            .ToListAsync();
 
diff --git a/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs b/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs
index b2ef2e0da..d1981cc5d 100644
--- a/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs
+++ b/src/FilterLists.Services/Tag/MappingProfiles/TagDtoMappingProfile.cs
@@ -1,4 +1,5 @@
-using AutoMapper;
+using System.Linq;
+using AutoMapper;
 using FilterLists.Services.Tag.Models;
 using JetBrains.Annotations;
 
@@ -11,6 +12,10 @@ public TagDtoMappingProfile() =>
             CreateMap<Data.Entities.Tag, TagDto>()
                 .ForMember(dest => dest.Id,
                     opt => opt.MapFrom(src =>
-                        (int)src.Id));
+                        (int)src.Id))
+                .ForMember(dest => dest.FilterListIds,
+                    opt => opt.MapFrom(src =>
+                        src.FilterListTags
+                           .Select(ft => (int)ft.FilterListId)));
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Tag/Models/TagDto.cs b/src/FilterLists.Services/Tag/Models/TagDto.cs
index 17f026530..4aefc0490 100644
--- a/src/FilterLists.Services/Tag/Models/TagDto.cs
+++ b/src/FilterLists.Services/Tag/Models/TagDto.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace FilterLists.Services.Tag.Models
 {
@@ -6,7 +7,8 @@ namespace FilterLists.Services.Tag.Models
     public class TagDto
     {
         public int Id { get; set; }
-        public string Name { get; set; }
         public string Description { get; set; }
+        public List<int> FilterListIds { get; set; }
+        public string Name { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Services/Tag/TagService.cs b/src/FilterLists.Services/Tag/TagService.cs
index b11d636bb..19ff72441 100644
--- a/src/FilterLists.Services/Tag/TagService.cs
+++ b/src/FilterLists.Services/Tag/TagService.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using AutoMapper;
 using AutoMapper.QueryableExtensions;
@@ -20,7 +19,6 @@ public TagService(FilterListsDbContext dbContext, IConfigurationProvider mapConf
 
         public async Task<IEnumerable<TagDto>> GetAll() =>
             await DbContext.Tags
-                           .OrderBy(s => s.Name)
                            .ProjectTo<TagDto>(MapConfig)
                            .ToListAsync();
 
diff --git a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx
index 6c3794b99..41d9bce4a 100644
--- a/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx
+++ b/src/FilterLists.Web/ClientApp/modules/home/components/listsTable/ListsTable.tsx
@@ -30,6 +30,7 @@ export const ListsTable = (props: IProps) =>
               UpdatedDate(props.columnVisibility),
               DetailsButton
           ]}
+          defaultSorted={[{ id: "name" }]}
           SubComponent={(r: any) => <DetailsExpander listId={r.original.id}/>}
           className="-striped -highlight"/>
     : <div className="loader">Loading...</div>;
\ No newline at end of file