diff --git a/frontend/bindata/templates/page.tpl b/frontend/bindata/templates/page.tpl
index 3fa4817..5d02424 100644
--- a/frontend/bindata/templates/page.tpl
+++ b/frontend/bindata/templates/page.tpl
@@ -29,12 +29,12 @@
 		<ul class="navbar-nav mr-auto">
 			<li class="nav-item">
 				<a class="nav-link{{ if .AllServersLinkActive }} active{{ end }}"
-					href="/{{ urlquery $option }}/{{ urlquery .AllServersURL }}/{{ urlquery $target }}"> All Servers </a>
+					href="/{{ $option }}/{{ .AllServersURL }}/{{ $target }}"> All Servers </a>
 			</li>
 			{{ range $k, $v := .Servers }}
 			<li class="nav-item">
 				<a class="nav-link{{ if eq $server $v }} active{{ end }}"
-					href="/{{ urlquery $option }}/{{ urlquery $v }}/{{ urlquery $target }}">{{ html $v }}</a>
+					href="/{{ $option }}/{{ $v }}/{{ $target }}">{{ html $v }}</a>
 			</li>
 			{{ end }}
 		</ul>
@@ -67,9 +67,9 @@
 
 <script>
 function goto() {
-	let action = encodeURIComponent($('[name="action"]').val());
-	let server = encodeURIComponent($('[name="server"]').val());
-	let target = encodeURIComponent($('[name="target"]').val());
+	let action = $('[name="action"]').val();
+	let server = $('[name="server"]').val();
+	let target = $('[name="target"]').val();
 	let url = "";
 
 	if (action == "whois") {
diff --git a/frontend/bindata/templates/summary.tpl b/frontend/bindata/templates/summary.tpl
index d70795f..c0c97f9 100644
--- a/frontend/bindata/templates/summary.tpl
+++ b/frontend/bindata/templates/summary.tpl
@@ -9,7 +9,7 @@
   <tbody>
 {{ range .Rows }}
     <tr class="table-{{ .MappedState }}">
-      <td><a href="/detail/{{ urlquery $ServerName }}/{{ urlquery .Name }}">{{ html .Name }}</a></td>
+      <td><a href="/detail/{{ $ServerName }}/{{ urlquery .Name }}">{{ html .Name }}</a></td>
       <td>{{ html .Proto }}</td>
       <td>{{ html .Table }}</td>
       <td>{{ html .State }}</td>