Corrects insert or update logic, holds notifications until end of batch operations