Some more fixes in similarity server and similarity update