Fix more issues with granular table updates