fixes to Search
Merge branch 'master' of github.com:hebkhan/server