diff --git a/assets/views/rank.jet.html b/assets/views/rank.jet.html
index c1c98ee..862b89e 100644
--- a/assets/views/rank.jet.html
+++ b/assets/views/rank.jet.html
@@ -5,9 +5,10 @@
 <div class="container">
   <h1>{{ .Title }}</h1>
 
+
   <div class="switcher">
-    {{- Mode := isset(.Queries.mode) ? .Queries.mode : "daily" }}
-    {{- Content := isset(.Queries.content) ? .Queries.content : "all" }}
+    {{- Mode := isset(Queries.mode) ? Queries.mode : "daily" }}
+    {{- Content := isset(Queries.content) ? Queries.content : "all" }}
 
     {{- url := "" }}
     {{- if Mode == "original" || Mode == "male" || Mode == "female" || Mode == ""}}
@@ -17,7 +18,7 @@
     {{- url = "/ranking?mode=" + Mode + "&date=" + .Data.CurrentDate + "&page=1&content=" }}
     {{- end }}
     <div class="switch-title">Content</div>
-    {{- path := slice("all",     "illust",        "manga",  "ugoira") }}
+    {{- path := slice("all", "illust", "manga", "ugoira") }}
     {{- name := slice("Overall", "Illustrations", "Mangas", "Ugoira")}}
     {{- yield Switcher(baseURL=url, paths=path, names=name, currentPath=Content)}}
   </div>
@@ -58,13 +59,9 @@
     "&page=1" }}
     <div class="switch-title">Date (current: {{ .Data.CurrentDate }})</div>
     {{- if .Data.PrevDate != "false" }}
-    <a href="{{ url }}&date={{.Data.PrevDate}}" class="switch-button"
-      >Yesterday</a
-    >
+    <a href="{{ url }}&date={{.Data.PrevDate}}" class="switch-button">Yesterday</a>
     {{- end }} {{ if .Data.NextDate != "false" }}
-    <a href="{{ url }}&date={{.Data.NextDate}}" class="switch-button"
-      >Next day</a
-    >
+    <a href="{{ url }}&date={{.Data.NextDate}}" class="switch-button">Next day</a>
     {{- end }}
     <a href="{{ url }}" class="switch-button">Latest</a>
     <span class="switch-seperator"></span>
diff --git a/template/render.go b/template/render.go
index c91b3c6..608b7c9 100644
--- a/template/render.go
+++ b/template/render.go
@@ -70,10 +70,16 @@ func GetTemplatingVariables(r *http.Request) jet.VarMap {
 		cookies[string(name)] = value
 	}
 
+	queries := make(map[string]string)
+
+	for k, v := range r.URL.Query() {
+		queries[k] = v[0]
+	}
+
 	return jet.VarMap{}.
 		Set("BaseURL", baseURL).
 		Set("PageURL", pageURL).
 		Set("LoggedIn", token != "").
-		Set("Queries", r.URL.Query().Encode()).
+		Set("Queries", queries).
 		Set("CookieList", cookies)
 }
diff --git a/test b/test
new file mode 100644
index 0000000..e69de29