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