diff --git a/WebfrontCore/Controllers/ClientController.cs b/WebfrontCore/Controllers/ClientController.cs
index 8864153a..678ba628 100644
--- a/WebfrontCore/Controllers/ClientController.cs
+++ b/WebfrontCore/Controllers/ClientController.cs
@@ -51,10 +51,12 @@ namespace WebfrontCore.Controllers
                 NetworkId = client.NetworkId,
                 Meta = new List<ProfileMeta>(),
                 Aliases = client.AliasLink.Children
-                    .Select(a => a.Name)
-                    .Prepend(client.Name)
-                    .OrderBy(a => a)
+                    .Select(_alias => _alias.Name)
+                    .GroupBy(_alias => _alias.StripColors())
+                    // we want the longest "duplicate" name
+                    .Select(_grp => _grp.OrderByDescending(_name => _name.Length).First())
                     .Distinct()
+                    .OrderBy(a => a)
                     .ToList(),
                 IPs = client.AliasLink.Children
                     .Where(i => i.IPAddress != null)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c3e40004..dbad2be9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -132,10 +132,11 @@ steps:
     tagSource: 'userSpecifiedTag'
     tag: '$(VersionInformation.Major).$(VersionInformation.Minor)-$(buildConfiguration)$(VersionInformation.Build)r$(VersionInformation.Revision)-$(Build.BuildId)'
     title: 'Version $(VersionInformation.Major).$(VersionInformation.Minor) $(buildConfiguration) $(VersionInformation.Build) Revision $(VersionInformation.Revision) Build $(Build.BuildId)'
-    releaseNotesFilePath: '$(Build.Repository.LocalPath)/version.txt'
     assets: '$(Build.ArtifactStagingDirectory)/*.zip'
     isPreRelease: true
-    changeLogCompareToRelease: 'lastFullRelease'
+    releaseNotesSource: 'inline'
+    releaseNotesInline: 'todo'
+    changeLogCompareToRelease: 'lastNonDraftRelease'
     changeLogType: 'commitBased'
 
 - task: PublishPipelineArtifact@1