Improve search behavior, return facebook avatar
Resolve merge conflicts