Fixed search functionality (all but player was broken in earlier commit)
Merge pull request #117 from wriley/search

Fixed search functionality (all but player was broken in earlier commit)