diff --git a/database/db.js b/database/db.js
index bc773a2..677b7f8 100644
--- a/database/db.js
+++ b/database/db.js
@@ -538,7 +538,6 @@ db.getBookmarksTable = function(params) {
             sql += " ORDER BY bookmarks.click_count DESC, bookmarks.created_at DESC";
         }
     }
-    console.log(sql);
     return new Promise(function(resolve, reject) {
         client.query(sql, (err, result) => {
             if (err) {
@@ -575,20 +574,11 @@ db.getBookmarksByTag = function(params) {
             if (err) {
                 reject(err);
             } else {
-                sql += " LIMIT " + (params.currentPage - 1) * params.perPageItems + ", " + params.perPageItems;
-                var totalItems = result.length;
-                console.log(totalItems, sql);
-                client.query(sql, (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        var bookmarksData = {
-                            totalItems: totalItems,
-                            bookmarks: result,
-                        }
-                        resolve(bookmarksData);
-                    }
-                });
+                var bookmarksData = {
+                    totalItems: result.length,
+                    bookmarks: result.slice((params.currentPage - 1) * params.perPageItems, params.currentPage * params.perPageItems),
+                }
+                resolve(bookmarksData);
             }
         });
     })
@@ -641,20 +631,17 @@ db.getBookmarksSearch = function(params) {
             if (err) {
                 reject(err);
             } else {
-
-                sql += " LIMIT " + (params.currentPage - 1) * params.perPageItems + ", " + params.perPageItems;
-                var totalItems = result.length;
-                client.query(sql, (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        var searchData = {
-                            totalItems: totalItems,
-                            bookmarks: result,
-                        }
-                        resolve(searchData);
-                    }
-                });
+                // 如果是全站搜索，默认有限显示其他用户的
+                if (params.userRange == '2') {
+                    result.sort((a, b) => {
+                        return params.userId == a.user_id ? 1 : -1;
+                    })
+                }
+                var searchData = {
+                    totalItems: result.length,
+                    bookmarks: result.splice((params.currentPage - 1) * params.perPageItems, params.currentPage * params.perPageItems),
+                }
+                resolve(searchData);
             }
         });
     })
diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js
index 969d414..fdad1ad 100644
--- a/public/scripts/controllers/search-controller.js
+++ b/public/scripts/controllers/search-controller.js
@@ -126,14 +126,13 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
             .then((data) => {
                 pubSubService.publish('EditCtr.inserBookmarsSuccess', data);
                 if (data.title) {
-                    toastr.success('[ ' + data.title + ' ] 收藏成功，将自动重新更新书签！', "提示");
+                    toastr.success('[ ' + data.title + ' ] 收藏成功！', "提示");
                 } else {
-                    toastr.error('[ ' + bookmark.title + ' ] 收藏失败', "提示");
+                    toastr.error('[ ' + bookmark.title + ' ] 收藏失败！', "提示");
                 }
             })
             .catch((err) => {
-                console.log('favoriteBookmark err', err);
-                toastr.error('[ ' + bookmark.title + ' ] 收藏失败' + JSON.stringify(err), "提示");
+                toastr.error('[ ' + bookmark.title + ' ] 收藏失败，' + JSON.stringify(err), "提示");
             });
     }
 
diff --git a/public/views/tags.html b/public/views/tags.html
index bc86439..63aa021 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -1,7 +1,7 @@
 <div class="ui segment js-tags">
     <div class="ui container" ng-show="!editMode">
         <div class="ui grid">
-            <div class="two wide column  js-tag-label" ng-class="" ng-mouseover="" ng-mouseleave="" ng-repeat="tag in tags">
+            <div class="two wide column  js-tag-label" ng-if="tag.cnt" ng-repeat="tag in tags">
                 <div class="ui small label" ng-class="{green:tag.bookmarkClicked}" ng-click="getBookmarks(tag.id, 1)">
                     {{ tag.name }}
                     ({{ tag.cnt || 0 }})
diff --git a/routes/api.js b/routes/api.js
index 91bb40f..01a03b2 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -254,7 +254,6 @@ api.get('/bookmarks', function(req, res) {
         db.getTags(userId)
             .then((tags) => db.getBookmarksNavigate(tags))
             .then((result) => {
-                console.log('ddddddddddddd')
                 var data = [];
                 var tag = {
                     id: result && result[0] && result[0].tag_id,
@@ -295,7 +294,6 @@ api.get('/bookmarks', function(req, res) {
                         click: item.click,
                     }
                 })
-                console.log(JSON.stringify(temp));
                 res.json(data);
             })
             .catch((err) => console.log('bookmarks navigate err', err));