diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 666b14c8bf6..a4683d9e9e0 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.7.3</Version>
+    <Version>9.7.4-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Router/RouteTableFactory.cs b/src/BootstrapBlazor/Router/RouteTableFactory.cs
index 3c015514bbf..c3519ef9dad 100644
--- a/src/BootstrapBlazor/Router/RouteTableFactory.cs
+++ b/src/BootstrapBlazor/Router/RouteTableFactory.cs
@@ -8,46 +8,6 @@
 namespace BootstrapBlazor.Components;
 
 [ExcludeFromCodeCoverage]
-#if NET5_0
-internal static class RouteTableFactory
-{
-    [NotNull]
-    private static Microsoft.AspNetCore.Components.Routing.IRouteTable? Routes { get; set; }
-    private static readonly HashSet<Assembly> _assemblies = new();
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="assemblies"></param>
-    /// <param name="url"></param>
-    /// <returns></returns>
-    public static RouteContext Create(IEnumerable<Assembly>? assemblies, string url)
-    {
-        RefreshRouteTable(assemblies);
-        if (url.IndexOf("?") > 0) url = url[..url.IndexOf("?")];
-        var routeContext = new Microsoft.AspNetCore.Components.Routing.RouteContext(url);
-        Routes.Route(routeContext);
-        return new RouteContext()
-        {
-            Handler = routeContext.Handler,
-            Parameters = routeContext.Parameters,
-            Segments = routeContext.Segments
-        };
-    }
-
-    private static void RefreshRouteTable(IEnumerable<Assembly>? assemblies)
-    {
-        assemblies ??= Enumerable.Empty<Assembly>();
-        var assembliesSet = new HashSet<Assembly>(assemblies);
-        if (!_assemblies.SetEquals(assembliesSet))
-        {
-            Routes = Microsoft.AspNetCore.Components.Routing.RouteTableFactory.Create(assemblies);
-            _assemblies.Clear();
-            _assemblies.UnionWith(assembliesSet);
-        }
-    }
-}
-#else
 internal static class RouteTableFactory
 {
     [NotNull]
@@ -63,7 +23,8 @@ internal static class RouteTableFactory
     public static RouteContext Create(IEnumerable<Assembly> assemblies, string url)
     {
         RefreshRouteTable(assemblies);
-        if (url.IndexOf("?") > 0) url = url[..url.IndexOf("?")];
+        var len = url.IndexOf("?", StringComparison.OrdinalIgnoreCase);
+        if (len > 0) url = url[..len];
         var routeContext = new Microsoft.AspNetCore.Components.Routing.RouteContext(url);
         Routes.Route(routeContext);
         return new RouteContext()
@@ -85,4 +46,3 @@ private static void RefreshRouteTable(IEnumerable<Assembly> assemblies)
         }
     }
 }
-#endif