Merge remote-tracking branch 'upstream/user' into user
User list search bug
Merge pull request #585 from sexnothing/user

User list andvance search bug