diff --git a/src/routes.json b/src/routes.json
index 4c462e277..e9b3386df 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -137,8 +137,8 @@
     },
     {
         "name": "educator-landing",
-        "pattern": "^/educators/?$",
-        "routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
+        "pattern": "^/educators/?(\\?.*)?$",
+        "routeAlias": "/educators(?:/(faq|register|waiting))?/?(\\?.*)?$",
         "view": "teachers/landing/landing",
         "title": "Educators"
     },
@@ -304,22 +304,22 @@
     },
     {
         "name": "teacher-faq",
-        "pattern": "^/educators/faq/?$",
-        "routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
+        "pattern": "^/educators/faq/?(\\?.*)?$",
+        "routeAlias": "/educators(?:/(faq|register|waiting))?/?(\\?.*)?$",
         "view": "teachers/faq/faq",
         "title": "Teacher Accounts FAQ"
     },
     {
         "name": "teacherregistration",
-        "pattern": "^/educators/register/?$",
-        "routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
+        "pattern": "^/educators/register/?(\\?.*)?$",
+        "routeAlias": "/educators(?:/(faq|register|waiting))?/?(\\?.*)?$",
         "view": "teacherregistration/teacherregistration",
         "title": "Teacher Registration"
     },
     {
         "name": "teacherwaitingroom",
         "pattern": "^/educators/waiting",
-        "routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
+        "routeAlias": "/educators(?:/(faq|register|waiting))?/?(\\?.*)?$",
         "view": "teacherwaitingroom/teacherwaitingroom",
         "title": "Thank you for requesting a Scratch Teacher Account"
     },