diff --git a/package.json b/package.json
index 47430a197..3f2d9fa13 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "redux": "3.5.2",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20181227160059",
+    "scratch-gui": "0.1.0-prerelease.20190102131553",
     "scratch-l10n": "latest",
     "scratchr2_translations": "git://github.com/LLK/scratchr2_translations.git#master",
     "slick-carousel": "1.6.0",
diff --git a/src/routes.json b/src/routes.json
index 0df2f55f3..cea2252ed 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -101,7 +101,7 @@
     },
     {
         "name": "download",
-        "pattern": "^/download/?(.+)?$",
+        "pattern": "^/download/?(\\?.*)?$",
         "routeAlias": "/download",
         "view": "download/download",
         "title": "Scratch Offline Editor"
@@ -122,7 +122,7 @@
     },
     {
         "name": "faq",
-        "pattern": "^/info/faq/?(.+)?$",
+        "pattern": "^/info/faq/?(\\?.*)?$",
         "routeAlias": "/info/(cards|communityblocks-interviews|credits|faq)/?$",
         "view": "faq/faq",
         "title": "FAQ"
@@ -172,7 +172,7 @@
     },
     {
         "name": "parents",
-        "pattern": "^/parents/?$",
+        "pattern": "^/parents/?(\\?.*)?$",
         "routeAlias": "/parents/",
         "view": "parents/parents",
         "title": "For Parents"
@@ -206,7 +206,7 @@
     },
     {
         "name": "scratch2",
-        "pattern": "^/download/scratch2/?$",
+        "pattern": "^/download/scratch2/?(\\?.*)?$",
         "routeAlias": "/download/scratch2",
         "view": "download/scratch2/download",
         "title": "Scratch 2.0"
@@ -321,7 +321,7 @@
     },
     {
         "name": "download-redirect",
-        "pattern": "^/scratch2download/?$",
+        "pattern": "^/scratch2download/?(\\?.*)?$",
         "routeAlias": "/scratch2download",
         "redirect": "/download"
     },