Very small refactoring in similarity service
Merge branch 'master' into apiv2