diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index 836e1c75..239198f6 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -662,8 +662,8 @@
                                                     <li><a href="#">Google HTTPS-JSON (https://dns.google.com/resolve)</a></li>
                                                     <li><a href="#">IBM Quad9 Secure (9.9.9.9)</a></li>
                                                     <li><a href="#">IBM Quad9 Secure ([2620:fe::fe])</a></li>
-                                                    <li><a href="#">IBM Quad9 Secure TLS (9.9.9.9:853)</a></li>
-                                                    <li><a href="#">IBM Quad9 Secure TLS ([2620:fe::fe]:853)</a></li>
+                                                    <li><a href="#">IBM Quad9 Secure TLS (dns.quad9.net (9.9.9.9:853))</a></li>
+                                                    <li><a href="#">IBM Quad9 Secure TLS (dns.quad9.net ([2620:fe::fe]:853))</a></li>
                                                     <li><a href="#">IBM Quad9 Unsecure (9.9.9.10)</a></li>
                                                     <li><a href="#">IBM Quad9 Unsecure ([2620:fe::10])</a></li>
                                                     <li><a href="#">OpenDNS (208.67.222.222)</a></li>
diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js
index 35ba8693..38fcb1c2 100644
--- a/DnsServerCore/www/js/main.js
+++ b/DnsServerCore/www/js/main.js
@@ -260,12 +260,12 @@ $(function () {
                 break;
 
             case "quad9-tls":
-                $("#txtForwarders").val("9.9.9.9:853");
+                $("#txtForwarders").val("dns.quad9.net (9.9.9.9:853)");
                 $("#rdForwarderProtocolTls").prop("checked", true);
                 break;
 
             case "quad9-tls-ipv6":
-                $("#txtForwarders").val("[2620:fe::fe]:853");
+                $("#txtForwarders").val("dns.quad9.net ([2620:fe::fe]:853)");
                 $("#rdForwarderProtocolTls").prop("checked", true);
                 break;
 
@@ -2431,7 +2431,7 @@ function resolveQuery(importRecords) {
     {
         var i = server.indexOf("(");
         if (i > -1) {
-            var j = server.indexOf(")");
+            var j = server.lastIndexOf(")");
             server = server.substring(i + 1, j);
         }
     }