fixed multiple server calls for overwrite/add feature