Misc fixes

also, similarity computed based ont he 'body' will be really adding lot of strain on the server; we should experiment...