Fix search
Merge pull request #712 from liuchuangww/user

Fix search
Merge branch 'user' into event