diff --git a/src/core/operations/FromHTMLEntity.mjs b/src/core/operations/FromHTMLEntity.mjs
index 5dae6e49..d2cc0a20 100644
--- a/src/core/operations/FromHTMLEntity.mjs
+++ b/src/core/operations/FromHTMLEntity.mjs
@@ -19,7 +19,7 @@ class FromHTMLEntity extends Operation {
         super();
 
         this.name = "From HTML Entity";
-        this.module = "Default";
+        this.module = "Encodings";
         this.description = "Converts HTML entities back to characters<br><br>e.g. <code>&amp;<span>amp;</span></code> becomes <code>&amp;</code>";
         this.infoURL = "https://wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references";
         this.inputType = "string";
@@ -40,7 +40,7 @@ class FromHTMLEntity extends Operation {
      * @returns {string}
      */
     run(input, args) {
-        const regex = /&(#?x?[a-zA-Z0-9]{1,8});/g;
+        const regex = /&(#?x?[a-zA-Z0-9]{1,20});/g;
         let output = "",
             m,
             i = 0;
@@ -547,6 +547,7 @@ const entityToByte = {
     "InvisibleComma": 8291,
     "euro": 8364,
     "tdot": 8411,
+    "TripleDot": 8411,
     "DotDot": 8412,
     "Copf": 8450,
     "incare": 8453,
@@ -1026,6 +1027,7 @@ const entityToByte = {
     "EmptySmallSquare": 9723,
     "FilledSmallSquare": 9724,
     "starf": 9733,
+    "bigstar": 9733,
     "star": 9734,
     "phone": 9742,
     "female": 9792,
diff --git a/src/core/operations/ToHTMLEntity.mjs b/src/core/operations/ToHTMLEntity.mjs
index 3493c114..c28b0cd7 100644
--- a/src/core/operations/ToHTMLEntity.mjs
+++ b/src/core/operations/ToHTMLEntity.mjs
@@ -19,7 +19,7 @@ class ToHTMLEntity extends Operation {
         super();
 
         this.name = "To HTML Entity";
-        this.module = "Default";
+        this.module = "Encodings";
         this.description = "Converts characters to HTML entities<br><br>e.g. <code>&amp;</code> becomes <code>&amp;<span>amp;</span></code>";
         this.infoURL = "https://wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references";
         this.inputType = "string";
@@ -33,7 +33,7 @@ class ToHTMLEntity extends Operation {
             {
                 "name": "Convert to",
                 "type": "option",
-                "value": ["Named entities where possible", "Numeric entities", "Hex entities"]
+                "value": ["Named entities", "Numeric entities", "Hex entities"]
             }
         ];
     }
@@ -548,7 +548,7 @@ const byteToEntity = {
     8290: "&InvisibleTimes;",
     8291: "&InvisibleComma;",
     8364: "&euro;",
-    8411: "&tdot; &TripleDot;",
+    8411: "&tdot;",
     8412: "&DotDot;",
     8450: "&Copf;",
     8453: "&incare;",
@@ -998,7 +998,7 @@ const byteToEntity = {
     9722: "&lltri;",
     9723: "&EmptySmallSquare;",
     9724: "&FilledSmallSquare;",
-    9733: "&starf; &bigstar;",
+    9733: "&starf;",
     9734: "&star;",
     9742: "&phone;",
     9792: "&female;",