diff --git a/src/utils/generateKeyValueList.ts b/src/utils/generateKeyValueList.ts
index 7f77bef..b3e276f 100644
--- a/src/utils/generateKeyValueList.ts
+++ b/src/utils/generateKeyValueList.ts
@@ -1,6 +1,11 @@
-function capitalize(s)
-{
-    return s[0].toUpperCase() + s.slice(1);
+const forceCaps = [
+    "ID",
+    "NSFW"
+]
+
+export function capitalize(s: string) {
+    s = s.replace(/([A-Z])/g, ' $1');
+    return forceCaps.includes(s.toUpperCase()) ? s.toUpperCase() : s[0].toUpperCase() + s.slice(1).toLowerCase();
 }
 
 function keyValueList(data) {
diff --git a/src/utils/getEmojiByName.ts b/src/utils/getEmojiByName.ts
index 0ec7cd6..bbc8f24 100644
--- a/src/utils/getEmojiByName.ts
+++ b/src/utils/getEmojiByName.ts
@@ -13,7 +13,7 @@
     if (id === undefined) {
         return `<a:a:946346549271732234>`
     } else if (id.toString().startsWith("a")) {
-        return `<a:a:${id.toString().slice(0, -1)}>`
+        return `<a:a:${id.toString().slice(1, id.toString().length)}>`
     }
     return `<:a:${id}>`;
 }