User Search Fixes
Merge pull request #335 from sandal-smuggler/user-search-fixes

User Search Fixes