diff --git a/app/json/words.json b/app/json/words.json
index fdc8f60..64fbcc4 100644
--- a/app/json/words.json
+++ b/app/json/words.json
@@ -1,27 +1,75 @@
 [
-{
-    "word": "settings",
-    "url": "http://www.dict.cn/settings",
-    "tags": ["设置", "设定", "偏好"]
-},
-{
-    "word": "feedback",
-    "tags": ["建议", "反馈", "投诉", "意见", "改进"]
-},
-{
-    "word": "project",
-    "tags": ["项目", "标", "工程"]
-},
-{
-    "word": "dashboard",
-    "tags": ["仪表盘", "概览", "主页", "监控"]
-},
-{
-    "word": "redirect",
-    "tags": ["跳转", "转到"]
-},
-{
-    "word": "following",
-    "tags": ["关注", "正在关注", "关心"]
-}
+    {
+        "word": "settings",
+        "url": "http://www.dict.cn/settings",
+        "tags": ["设置", "设定", "偏好"]
+    },
+    {
+        "word": "feedback",
+        "tags": ["建议", "反馈", "投诉", "意见", "改进"]
+    },
+    {
+        "word": "project",
+        "tags": ["项目", "标", "工程"]
+    },
+    {
+        "word": "dashboard",
+        "tags": ["仪表盘", "概览", "主页", "监控"]
+    },
+    {
+        "word": "redirect",
+        "tags": ["跳转", "转到"]
+    },
+    {
+        "word": "following",
+        "tags": ["关注", "正在关注", "关心"]
+    },
+    {
+        "word": "gender",
+        "tags": ["性别", "身份"]
+    },
+    {
+        "word": "phone",
+        "tags": ["手机号码"]
+    },
+    {
+        "word": "avatar",
+        "tags": ["头像"]
+    },
+    {
+        "word": "password",
+        "tags": ["密码"]
+    },
+    {
+        "word": "points",
+        "tags": ["积分"]
+    },
+    {
+        "word": "score",
+        "tags": ["得分", "分值"]
+    },
+    {
+        "word": "diliveryman",
+        "tags": ["配送员"]
+    },
+    {
+        "word": "is_show",
+        "tags": ["是否可见", "是否封号"]
+    },
+    {
+        "word": "username",
+        "tags": ["用户名", "收货人"]
+    },
+    {
+        "word": "nickname",
+        "tags": ["昵称"]
+    },
+    {
+        "word": "is_default",
+        "tags": ["是否默认"]
+    },
+    {
+        "word": "detail_address",
+        "tags": ["详细地址"]
+    }
 ]
\ No newline at end of file
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 63736fd..a54a04d 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -40,7 +40,7 @@ angular.module('abstackVarLib', ['zeroclipboard'])
         function compare(origin, target){
             origin = origin.join('');
             for(var i = 0;i<target.length;i++){
-                if(origin.indexOf(target[i]) != -1)
+                if(origin.indexOf(target[i]) != -1 && i == target.length - 1)
                     return true;
             }
             return false;
@@ -51,9 +51,10 @@ angular.module('abstackVarLib', ['zeroclipboard'])
                 return input;
 
             var temp = [];
-            for(var i = 0;i<input.length;i++){
-                if(compare(input[i].tags, type.split(' ')))
+            for(var i = 0;i<input.length;i++) {
+                if(compare(input[i].tags, type.split(' ')) || input[i].word.indexOf(type) != -1) {
                     temp.push(input[i]);
+                }
             }
 
             return temp;