diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 469a0a7b..6b42f15b 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -338,10 +338,13 @@
 
     private Dictionary<string, string> ParseQueryString(string query)
     {
-        Dictionary<string, string> querystring = new Dictionary<string, string>();
+        Dictionary<string, string> querystring = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); // case insensistive keys
         if (!string.IsNullOrEmpty(query))
         {
-            query = query.Substring(1); // ignore "?"
+            if (query.StartsWith("?"))
+            {
+                query = query.Substring(1); // ignore "?"
+            }
             foreach (string kvp in query.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries))
             {
                 if (kvp != "")