Fixed user ID bug in search results
Merge branch 'master' into production