diff --git a/mozilla/editor/ui/dialogs/content/EdAEAttributes.js b/mozilla/editor/ui/dialogs/content/EdAEAttributes.js
index 3f351e61003..45e5d2a68f0 100644
--- a/mozilla/editor/ui/dialogs/content/EdAEAttributes.js
+++ b/mozilla/editor/ui/dialogs/content/EdAEAttributes.js
@@ -148,7 +148,7 @@ gHTMLAttr.a =
   "type",
   "name",
   "href",
-  "hreflang",
+  "^hreflang",
   "target",
   "rel",
   "rev",
@@ -788,7 +788,7 @@ gHTMLAttr.hr =
 [
   "align",
   "noshade",
-  "size",
+  "#size",
   "%width",
   "-",
   "_core",
@@ -902,7 +902,7 @@ gHTMLAttr.input =
   "checked",
   "disabled",
   "readonly",
-  "size",
+  "#size",
   "#maxlength",
   "src",
   "alt",
@@ -1051,7 +1051,7 @@ gHTMLAttr.link =
 [
   "charset",
   "href",
-  "hreflang",
+  "^hreflang",
   "type",
   "rel",
   "rev",
diff --git a/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js b/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
index 58969e080b0..985445d1820 100644
--- a/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
+++ b/mozilla/editor/ui/dialogs/content/EdAEHTMLAttributes.js
@@ -90,11 +90,16 @@ function BuildHTMLAttributeNameList()
           //  menuitem.setAttribute("class", "menuitem-highlight-1");
 
           // Set flags to filter value input
-          menuitem.setAttribute("forceOneChar", forceOneChar ? "true" : "");
-          menuitem.setAttribute("limitFirstChar", limitFirstChar ? "true" : "");
-          menuitem.setAttribute("forceInteger", forceInteger ? "true" : "");
-          menuitem.setAttribute("forceSignedInteger", forceSignedInteger ? "true" : "");
-          menuitem.setAttribute("forceIntOrPercent", forceIntOrPercent ? "true" : "");
+          if (forceOneChar)
+            menuitem.setAttribute("forceOneChar","true");
+          if (limitFirstChar)
+            menuitem.setAttribute("limitFirstChar", "true");
+          if (forceInteger)
+            menuitem.setAttribute("forceInteger", "true");
+          if (forceSignedInteger)
+            menuitem.setAttribute("forceSignedInteger", "true");
+          if (forceIntOrPercent)
+            menuitem.setAttribute("forceIntOrPercent", "true");
         }
       }
     }