Fixed SVY-7535 : in find mode conversion should not happen (server and
client side)
+ a few other small fixes.