diff --git a/scripts/build-data.js b/scripts/build-data.js
index 42b2400c0..0e5ffcb9e 100644
--- a/scripts/build-data.js
+++ b/scripts/build-data.js
@@ -5,7 +5,7 @@ var fs = require('fs'),
     mkdirp = require('mkdirp')
 
 var categories = ['People', 'Nature', 'Foods', 'Activity', 'Places', 'Objects', 'Symbols', 'Flags'],
-    data = { categories: [], emojis: {}, skins: {} },
+    data = { categories: [], emojis: {}, skins: {}, short_names: {} },
     categoriesIndex = {}
 
 categories.forEach((category, i) => {
@@ -22,7 +22,6 @@ emojiData.sort((a, b) => {
 
 emojiData.forEach((datum) => {
   var category = datum.category,
-      shortName = datum.short_name,
       keywords = [],
       categoryIndex
 
@@ -83,6 +82,11 @@ emojiData.forEach((datum) => {
     data.emojis[datum.short_name] = datum
   }
 
+  datum.short_names.forEach((short_name, i) => {
+    if (i == 0) { return }
+    data.short_names[short_name] = datum.short_name
+  })
+
   delete datum.docomo
   delete datum.au
   delete datum.softbank
diff --git a/src/utils/index.js b/src/utils/index.js
index cdef2cb17..74e1fc489 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -37,13 +37,21 @@ function getSanitizedData() {
 
 function getData(emoji, skin, sheetURL) {
   var emojiData = {},
-      _emojiData = null
+      _emojiData, _emoji, _id
 
   if (typeof emoji == 'string') {
+    if (_emoji = data.short_names[emoji]) {
+      emoji = _emoji
+    }
+
     if (_emojiData = data.emojis[emoji]) {
       emojiData = _emojiData
     }
   } else if (emoji.id) {
+    if (_id = data.short_names[emoji.id]) {
+      emoji.id = _id
+    }
+
     if (_emojiData = data.emojis[emoji.id]) {
       emojiData = _emojiData
       skin || (skin = emoji.skin)