Merge pull request #28 from ivanStraltsou/dev

user search improved
Merge pull request #29 from ivanStraltsou/dev

user model fix
search fix