diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
index e71c3140e..b01e3a486 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs
@@ -36,6 +36,8 @@ internal class FilterListTypeConfiguration : IEntityTypeConfiguration<FilterList
 {
     public virtual void Configure(EntityTypeBuilder<FilterList> builder)
     {
+        builder.HasIndex(f => f.Name)
+            .IsUnique();
         builder.HasDataJsonFile<FilterList>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
index 4674dd719..119159b99 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListViewUrl.cs
@@ -18,9 +18,12 @@ internal class FilterListViewUrlConfiguration : IEntityTypeConfiguration<FilterL
     public virtual void Configure(EntityTypeBuilder<FilterListViewUrl> builder)
     {
         builder.ToTable(nameof(FilterListViewUrl) + "s");
-        builder.Property(u => u.SegmentNumber).HasDefaultValue(1);
-        builder.Property(u => u.Primariness).HasDefaultValue(1);
-        builder.HasIndex(u => new { u.FilterListId, u.SegmentNumber, u.Primariness }).IsUnique();
+        builder.Property(u => u.SegmentNumber)
+            .HasDefaultValue(1);
+        builder.Property(u => u.Primariness)
+            .HasDefaultValue(1);
+        builder.HasIndex(u => new { u.FilterListId, u.SegmentNumber, u.Primariness })
+            .IsUnique();
         builder.HasDataJsonFile<FilterListViewUrl>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
index 9222276ad..68823ea08 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs
@@ -18,6 +18,8 @@ public virtual void Configure(EntityTypeBuilder<Language> builder)
         builder.Property(l => l.Iso6391)
             .IsFixedLength()
             .HasMaxLength(2);
+        builder.HasIndex(l => l.Name)
+            .IsUnique();
         builder.HasDataJsonFile<Language>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
index e36c81f0d..f46d5e88d 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs
@@ -18,6 +18,8 @@ internal class LicenseTypeConfiguration : IEntityTypeConfiguration<License>
 {
     public virtual void Configure(EntityTypeBuilder<License> builder)
     {
+        builder.HasIndex(l => l.Name)
+            .IsUnique();
         builder.HasDataJsonFile<License>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
index 5043a3217..82ff3eb92 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs
@@ -17,6 +17,8 @@ internal class MaintainerTypeConfiguration : IEntityTypeConfiguration<Maintainer
 {
     public virtual void Configure(EntityTypeBuilder<Maintainer> builder)
     {
+        builder.HasIndex(m => m.Name)
+            .IsUnique();
         builder.HasDataJsonFile<Maintainer>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
index 018dab5ca..88814a6ef 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs
@@ -18,6 +18,8 @@ internal class SoftwareTypeConfiguration : IEntityTypeConfiguration<Software>
 {
     public virtual void Configure(EntityTypeBuilder<Software> builder)
     {
+        builder.HasIndex(s => s.Name)
+            .IsUnique();
         builder.HasDataJsonFile<Software>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
index 15d7a977f..b200c951a 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs
@@ -17,6 +17,8 @@ internal class SyntaxTypeConfiguration : IEntityTypeConfiguration<Syntax>
 {
     public virtual void Configure(EntityTypeBuilder<Syntax> builder)
     {
+        builder.HasIndex(s => s.Name)
+            .IsUnique();
         builder.HasDataJsonFile<Syntax>();
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
index 4c669915b..db49dca8b 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs
@@ -15,6 +15,8 @@ internal class TagTypeConfiguration : IEntityTypeConfiguration<Tag>
 {
     public virtual void Configure(EntityTypeBuilder<Tag> builder)
     {
+        builder.HasIndex(t => t.Name)
+            .IsUnique();
         builder.HasDataJsonFile<Tag>();
     }
 }
diff --git a/services/FilterLists.sln.DotSettings b/services/FilterLists.sln.DotSettings
index 831dba58a..f7fdef7c9 100644
--- a/services/FilterLists.sln.DotSettings
+++ b/services/FilterLists.sln.DotSettings
@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>