Merge pull request #241 from nickescallon/dev

search view now always shows player