added update & rescan on server-side