Fixed number of results returned in similarity search handler
Merge branch 'master' into production