[Client] Improved update performance and avoided wrong warnings