diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index 9359f750..be9b1574 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -497,52 +497,52 @@
                                         <div class="form-group">
                                             <label for="txtDnsClientNameServer">Server</label>
                                             <div class="input-group dropdown">
-                                                <input type="text" class="form-control dropdown-toggle" style="min-width: 250px;" id="txtDnsClientNameServer" value="This Server (this-server)">
+                                                <input type="text" class="form-control dropdown-toggle" style="min-width: 250px;" id="txtDnsClientNameServer" value="This Server {this-server}">
                                                 <ul class="dropdown-menu" id="optDnsClientNameServers">
-                                                    <li><a href="#">This Server (this-server)</a></li>
-                                                    <li><a href="#">Recursive Query (recursive-resolver)</a></li>
-                                                    <li><a href="#">Cloudflare (1.1.1.1)</a></li>
-                                                    <li><a href="#">Cloudflare (1.0.0.1)</a></li>
-                                                    <li><a href="#">Cloudflare ([2606:4700:4700::1111])</a></li>
-                                                    <li><a href="#">Cloudflare ([2606:4700:4700::1001])</a></li>
-                                                    <li><a href="#">Cloudflare TLS (cloudflare-dns.com (1.1.1.1:853))</a></li>
-                                                    <li><a href="#">Cloudflare TLS (cloudflare-dns.com (1.0.0.1:853))</a></li>
-                                                    <li><a href="#">Cloudflare TLS (cloudflare-dns.com ([2606:4700:4700::1111]:853))</a></li>
-                                                    <li><a href="#">Cloudflare TLS (cloudflare-dns.com ([2606:4700:4700::1001]:853))</a></li>
-                                                    <li><a href="#">Cloudflare HTTPS (https://cloudflare-dns.com/dns-query (1.1.1.1))</a></li>
-                                                    <li><a href="#">Cloudflare HTTPS-JSON (https://cloudflare-dns.com/dns-query (1.1.1.1))</a></li>
-                                                    <li><a href="#">Google (8.8.8.8)</a></li>
-                                                    <li><a href="#">Google (8.8.4.4)</a></li>
-                                                    <li><a href="#">Google ([2001:4860:4860::8888])</a></li>
-                                                    <li><a href="#">Google ([2001:4860:4860::8844])</a></li>
-                                                    <li><a href="#">Google TLS (dns.google (8.8.8.8:853))</a></li>
-                                                    <li><a href="#">Google TLS (dns.google (8.8.4.4:853))</a></li>
-                                                    <li><a href="#">Google TLS (dns.google ([2001:4860:4860::8888]:853))</a></li>
-                                                    <li><a href="#">Google TLS (dns.google ([2001:4860:4860::8844]:853))</a></li>
-                                                    <li><a href="#">Google HTTPS (https://dns.google/dns-query (8.8.8.8))</a></li>
-                                                    <li><a href="#">Google HTTPS-JSON (https://dns.google/resolve (8.8.8.8))</a></li>
-                                                    <li><a href="#">Quad9 Secure (9.9.9.9)</a></li>
-                                                    <li><a href="#">Quad9 Secure ([2620:fe::fe])</a></li>
-                                                    <li><a href="#">Quad9 Secure TLS (dns.quad9.net (9.9.9.9:853))</a></li>
-                                                    <li><a href="#">Quad9 Secure TLS (dns.quad9.net ([2620:fe::fe]:853))</a></li>
-                                                    <li><a href="#">Quad9 Secure HTTPS (https://dns.quad9.net/dns-query (9.9.9.9))</a></li>
-                                                    <li><a href="#">Quad9 Unsecure (9.9.9.10)</a></li>
-                                                    <li><a href="#">Quad9 Unsecure ([2620:fe::10])</a></li>
-                                                    <li><a href="#">Quad9 Unsecure TLS (dns10.quad9.net (9.9.9.10:853))</a></li>
-                                                    <li><a href="#">Quad9 Unsecure TLS (dns10.quad9.net ([2620:fe::10]:853))</a></li>
-                                                    <li><a href="#">Quad9 Unsecure HTTPS (https://dns10.quad9.net/dns-query (9.9.9.10))</a></li>
-                                                    <li><a href="#">OpenDNS (208.67.222.222)</a></li>
-                                                    <li><a href="#">OpenDNS (208.67.220.220)</a></li>
-                                                    <li><a href="#">OpenDNS ([2620:0:ccc::2])</a></li>
-                                                    <li><a href="#">OpenDNS ([2620:0:ccd::2])</a></li>
-                                                    <li><a href="#">OpenDNS FamilyShield (208.67.222.123)</a></li>
-                                                    <li><a href="#">OpenDNS FamilyShield (208.67.220.123)</a></li>
-                                                    <li><a href="#">Level3 (4.2.2.1)</a></li>
-                                                    <li><a href="#">Level3 (4.2.2.2)</a></li>
-                                                    <li><a href="#">Ultra (156.154.70.1)</a></li>
-                                                    <li><a href="#">Ultra (156.154.71.1)</a></li>
-                                                    <li><a href="#">Dyn (216.146.35.35)</a></li>
-                                                    <li><a href="#">Dyn (216.146.36.36)</a></li>
+                                                    <li><a href="#">This Server {this-server}</a></li>
+                                                    <li><a href="#">Recursive Query {recursive-resolver}</a></li>
+                                                    <li><a href="#">Cloudflare {1.1.1.1}</a></li>
+                                                    <li><a href="#">Cloudflare {1.0.0.1}</a></li>
+                                                    <li><a href="#">Cloudflare {[2606:4700:4700::1111]}</a></li>
+                                                    <li><a href="#">Cloudflare {[2606:4700:4700::1001]}</a></li>
+                                                    <li><a href="#">Cloudflare TLS {cloudflare-dns.com (1.1.1.1:853)}</a></li>
+                                                    <li><a href="#">Cloudflare TLS {cloudflare-dns.com (1.0.0.1:853)}</a></li>
+                                                    <li><a href="#">Cloudflare TLS {cloudflare-dns.com ([2606:4700:4700::1111]:853)}</a></li>
+                                                    <li><a href="#">Cloudflare TLS {cloudflare-dns.com ([2606:4700:4700::1001]:853)}</a></li>
+                                                    <li><a href="#">Cloudflare HTTPS {https://cloudflare-dns.com/dns-query}</a></li>
+                                                    <li><a href="#">Cloudflare HTTPS-JSON {https://cloudflare-dns.com/dns-query}</a></li>
+                                                    <li><a href="#">Google {8.8.8.8}</a></li>
+                                                    <li><a href="#">Google {8.8.4.4}</a></li>
+                                                    <li><a href="#">Google {[2001:4860:4860::8888]}</a></li>
+                                                    <li><a href="#">Google {[2001:4860:4860::8844]}</a></li>
+                                                    <li><a href="#">Google TLS {dns.google (8.8.8.8:853)}</a></li>
+                                                    <li><a href="#">Google TLS {dns.google (8.8.4.4:853)}</a></li>
+                                                    <li><a href="#">Google TLS {dns.google ([2001:4860:4860::8888]:853)}</a></li>
+                                                    <li><a href="#">Google TLS {dns.google ([2001:4860:4860::8844]:853)}</a></li>
+                                                    <li><a href="#">Google HTTPS {https://dns.google/dns-query}</a></li>
+                                                    <li><a href="#">Google HTTPS-JSON {https://dns.google/resolve}</a></li>
+                                                    <li><a href="#">Quad9 Secure {9.9.9.9}</a></li>
+                                                    <li><a href="#">Quad9 Secure {[2620:fe::fe]}</a></li>
+                                                    <li><a href="#">Quad9 Secure TLS {dns.quad9.net (9.9.9.9:853)}</a></li>
+                                                    <li><a href="#">Quad9 Secure TLS {dns.quad9.net ([2620:fe::fe]:853)}</a></li>
+                                                    <li><a href="#">Quad9 Secure HTTPS {https://dns.quad9.net/dns-query}</a></li>
+                                                    <li><a href="#">Quad9 Unsecure {9.9.9.10}</a></li>
+                                                    <li><a href="#">Quad9 Unsecure {[2620:fe::10]}</a></li>
+                                                    <li><a href="#">Quad9 Unsecure TLS {dns10.quad9.net (9.9.9.10:853)}</a></li>
+                                                    <li><a href="#">Quad9 Unsecure TLS {dns10.quad9.net ([2620:fe::10]:853)}</a></li>
+                                                    <li><a href="#">Quad9 Unsecure HTTPS {https://dns10.quad9.net/dns-query}</a></li>
+                                                    <li><a href="#">OpenDNS {208.67.222.222}</a></li>
+                                                    <li><a href="#">OpenDNS {208.67.220.220}</a></li>
+                                                    <li><a href="#">OpenDNS {[2620:0:ccc::2]}</a></li>
+                                                    <li><a href="#">OpenDNS {[2620:0:ccd::2]}</a></li>
+                                                    <li><a href="#">OpenDNS FamilyShield {208.67.222.123}</a></li>
+                                                    <li><a href="#">OpenDNS FamilyShield {208.67.220.123}</a></li>
+                                                    <li><a href="#">Level3 {4.2.2.1}</a></li>
+                                                    <li><a href="#">Level3 {4.2.2.2}</a></li>
+                                                    <li><a href="#">Ultra {156.154.70.1}</a></li>
+                                                    <li><a href="#">Ultra {156.154.71.1}</a></li>
+                                                    <li><a href="#">Dyn {216.146.35.35}</a></li>
+                                                    <li><a href="#">Dyn {216.146.36.36}</a></li>
                                                     <li><a href="#">a.root-servers.net</a></li>
                                                     <li><a href="#">b.root-servers.net</a></li>
                                                     <li><a href="#">c.root-servers.net</a></li>
diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js
index 2a2e75f8..b7362324 100644
--- a/DnsServerCore/www/js/main.js
+++ b/DnsServerCore/www/js/main.js
@@ -1501,9 +1501,9 @@ function resolveQuery(importRecords) {
     var protocol = $("#optDnsClientProtocol").val();
 
     {
-        var i = server.indexOf("(");
+        var i = server.indexOf("{");
         if (i > -1) {
-            var j = server.lastIndexOf(")");
+            var j = server.lastIndexOf("}");
             server = server.substring(i + 1, j);
         }
     }