Fix batch errors on multiple places/churches