diff --git a/common/content/hints.js b/common/content/hints.js
index e3ae23b5..bc3180d7 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -1276,7 +1276,7 @@ var Hints = Module("hints", {
             "regexpmap", {
                 "[iI]": "img",
                 "[asOTvVWy]": [":-moz-any-link", "area[href]", "img[src]", "iframe[src]"],
-                "[A]": ["[id]"],
+                "[A]": ["[id],a[name]"],
                 "[f]": "body",
                 "[F]": ["body", "code", "div", "html", "p", "pre", "span"],
                 "[S]": ["input:not([type=hidden])", "textarea", "button", "select"]
diff --git a/common/modules/protocol.jsm b/common/modules/protocol.jsm
index 7acb2e97..edb642ec 100644
--- a/common/modules/protocol.jsm
+++ b/common/modules/protocol.jsm
@@ -185,7 +185,7 @@ function XMLChannel(uri, contentType, noErrorChannel, unprivileged) {
         this.channel.owner = systemPrincipal;
 
     let type = this.channel.contentType;
-    if (type.indexOf("text/") == 0 || type.indexOf("+xml") == type.length - 4) {
+    if (/^text\/|[\/+]xml$/.test(type)) {
         let stream = services.InputStream(channelStream);
         let [, pre, doctype, url, extra, open, post] = util.regexp(<![CDATA[
                 ^ ([^]*?)