Bug fixes with search system.
Merge pull request #132 from mshamash/master

Bug fixes with search + friend system.