diff --git a/BlazorWebAssemblyXrefGenerator/BlazorWebAssemblyXrefGenerator.sln b/BlazorWebAssemblyXrefGenerator/BlazorWebAssemblyXrefGenerator.sln
index 434c3767a..c66d19724 100644
--- a/BlazorWebAssemblyXrefGenerator/BlazorWebAssemblyXrefGenerator.sln
+++ b/BlazorWebAssemblyXrefGenerator/BlazorWebAssemblyXrefGenerator.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.3.11206.111 d18.3
+VisualStudioVersion = 18.3.11206.111
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorWebAssemblyXrefGenerator", "BlazorWebAssemblyXrefGenerator.csproj", "{AC54A61E-49B7-4494-B9FF-978F64A9EF7C}"
 EndProject
diff --git a/BlazorWebAssemblyXrefGenerator/Pages/Home.razor b/BlazorWebAssemblyXrefGenerator/Pages/Home.razor
index 6eff6e136..979c6f4fb 100644
--- a/BlazorWebAssemblyXrefGenerator/Pages/Home.razor
+++ b/BlazorWebAssemblyXrefGenerator/Pages/Home.razor
@@ -1,5 +1,6 @@
 @page "/"
 @using System.Net
+@using System.Text
 @using System.Text.RegularExpressions
 @inject IHttpClientFactory ClientFactory
 
@@ -10,17 +11,6 @@
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <h3 class="panel-title">Search</h3>
-                        <span style="float:right">
-                            <InputSelect @bind-Value="dotNetVersion">
-                                <option>aspnetcore-10.0</option>
-                                <option>aspnetcore-9.0</option>
-                                <option>aspnetcore-8.0</option>
-                                <option>aspnetcore-7.0</option>
-                                <option>aspnetcore-6.0</option>
-                                <option>aspnetcore-5.0</option>
-                                <option>aspnetcore-3.1</option>
-                            </InputSelect>
-                        </span>
                     </div>
                     <div class="panel-body">
                         <div class="form-group">
@@ -68,7 +58,6 @@
     private SearchResults? SearchResultItems { get; set; }
     private List<Result> ResultsToRender { get; set; } = new();
     public string? message;
-    private string? dotNetVersion;
 
     private const int MaxResults = 22;
 
@@ -83,6 +72,7 @@
         message = string.Empty;
 
         var apiClient = ClientFactory.CreateClient("APIClient");
+
         if (string.IsNullOrEmpty(Model?.SearchText) || apiClient == null)
         {
             isSearching = false;
@@ -91,26 +81,32 @@
 
         try
         {
-            SearchResultItems = await apiClient.GetFromJsonAsync<SearchResults>($"api/apibrowser/dotnet/search?api-version=0.2&search={Model.SearchText}");
+            SearchResultItems = await apiClient.GetFromJsonAsync<SearchResults>($"api/apibrowser/dotnet/search?search={Model.SearchText}");
 
             if (SearchResultItems?.Results?.Any() == true)
             {
-                var index = 1;
                 foreach (var result in SearchResultItems.Results.Take(MaxResults))
                 {
-                    var client = ClientFactory.CreateClient();
-                    var encodedUrl = WebUtility.UrlEncode($"https://learn.microsoft.com/en-us{result.Url}?view={dotNetVersion}");
-                    using var request = new HttpRequestMessage(HttpMethod.Get, $"https://corsproxy.io/?{encodedUrl}");
-                    using var response = await client.SendAsync(request);
-                    var content = await response.Content.ReadAsStringAsync();
-
-                    var match = Regex.Match(content, "<meta name=\"ms.assetid\" content=\"(.+?)\" />");
-                    if (match.Success)
+                    if (!string.IsNullOrEmpty(result.DisplayName))
                     {
-                        result.Link = match.Groups[1].Value.Replace("*", "%2A").Replace("`", "%60");
+
+                        if (result.ItemType == "Constructor")
+                        {
+                            result.Link = Regex.Replace(result.DisplayName, @"\(.*\)", ".%23ctor%2A");
+                        }
+                        else if (result.ItemType == "Method")
+                        {
+                            result.Link = Regex.Replace(result.DisplayName, @"\(.*\)", "%2A");
+                        }
+                        else
+                        {
+                            result.Link = result.DisplayName;
+                        }
+
+                        result.Link = ReplaceGenericArity(result.Link ?? string.Empty);
                     }
 
-                    result.Index = index++;
+                    result.Index = ResultsToRender.Count + 1;
                     ResultsToRender.Add(result);
                     StateHasChanged();
                 }
@@ -137,6 +133,68 @@
         message = string.Empty;
     }
 
+    private static string ReplaceGenericArity(string value)
+    {
+        var builder = new StringBuilder();
+
+        for (var index = 0; index < value.Length; index++)
+        {
+            if (value[index] != '<')
+            {
+                builder.Append(value[index]);
+                continue;
+            }
+
+            var depth = 1;
+            var endIndex = index + 1;
+
+            while (endIndex < value.Length && depth > 0)
+            {
+                if (value[endIndex] == '<')
+                {
+                    depth++;
+                }
+                else if (value[endIndex] == '>')
+                {
+                    depth--;
+                }
+
+                endIndex++;
+            }
+
+            if (depth > 0)
+            {
+                builder.Append(value[index]);
+                continue;
+            }
+
+            var genericArguments = value[(index + 1)..(endIndex - 1)];
+            var arity = 1;
+            var argumentDepth = 0;
+
+            foreach (var character in genericArguments)
+            {
+                if (character == '<')
+                {
+                    argumentDepth++;
+                }
+                else if (character == '>')
+                {
+                    argumentDepth--;
+                }
+                else if (character == ',' && argumentDepth == 0)
+                {
+                    arity++;
+                }
+            }
+
+            builder.Append($"%60{arity}");
+            index = endIndex - 1;
+        }
+
+        return builder.ToString();
+    }
+
     public class FormModel
     {
         public string? SearchText { get; set; } = string.Empty;