diff --git a/App/StackExchange.DataExplorer/Controllers/QueryController.cs b/App/StackExchange.DataExplorer/Controllers/QueryController.cs
index 7b176051..a0f818f7 100644
--- a/App/StackExchange.DataExplorer/Controllers/QueryController.cs
+++ b/App/StackExchange.DataExplorer/Controllers/QueryController.cs
@@ -378,8 +378,8 @@ public ActionResult ShowSingleSiteCsv(string sitename, int revisionId, string sl
 
             if (!TryGetSite(sitename, out site))
             {
-                return site == null ?  (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/csv/{1}{2}",
-                    site.TinyName.ToLower(), revisionId, slug.HasValue() ? "/" + slug : ""
+                return site == null ?  (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/csv/{1}{2}{3}",
+                    site.TinyName.ToLower(), revisionId, slug.HasValue() ? "/" + slug : "", Request.Url.Query 
                 ));
             }
 
@@ -533,8 +533,8 @@ public ActionResult ShowPlan(string sitename, int revisionId, string slug)
 
             if (!TryGetSite(sitename, out site))
             {
-                return site == null ? (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/plan/{1}{2}",
-                    site.TinyName.ToLower(), revisionId, slug.HasValue() ? "/" + slug : ""
+                return site == null ? (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/plan/{1}{2}{3}",
+                    site.TinyName.ToLower(), revisionId, slug.HasValue() ? "/" + slug : "", Request.Url.Query
                 ));
             }
 
diff --git a/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs b/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs
index 96184666..1b1bfc9e 100644
--- a/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs
+++ b/App/StackExchange.DataExplorer/Controllers/QuerySetController.cs
@@ -39,8 +39,8 @@ public ActionResult ShowLatest(string sitename, int querySetId, string slug)
 
             if (!TryGetSite(sitename, out site))
             {
-                return site == null ? (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/query/{1}{2}",
-                    site.TinyName.ToLower(), querySetId, slug.HasValue() ? "/" + slug : ""
+                return site == null ? (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/query/{1}{2}{3}",
+                    site.TinyName.ToLower(), querySetId, slug.HasValue() ? "/" + slug : "", Request.Url.Query
                 ));
             }
 
@@ -64,8 +64,8 @@ public ActionResult Show(string sitename, int querySetId, int revisionId, string
 
             if (!TryGetSite(sitename, out site))
             {
-                return site == null ? (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/revision/{1}/{2}{3}",
-                    site.TinyName.ToLower(), querySetId, revisionId, slug.HasValue() ? "/" + slug : ""
+                return site == null ? (ActionResult)PageNotFound() : RedirectPermanent(string.Format("/{0}/revision/{1}/{2}{3}{4}",
+                    site.TinyName.ToLower(), querySetId, revisionId, slug.HasValue() ? "/" + slug : "", Request.Url.Query
                 ));
             }
 
@@ -185,7 +185,7 @@ private ActionResult ShowCommon(Revision revision, string slug, bool latest)
                     RevisionId = revision.Id,
                     QuerySetId = revision.QuerySet.Id,
                     SiteId = Site.Id,
-                    SiteName = Site.Name,
+                    SiteName = Site.TinyName.ToLower(),
                     Slug = revision.QuerySet.Title.URLFriendly(),
                     Url = Site.Url
                 }.WithCache(cachedResults);