LP#1917826: tweaks to data update