fix batch context and service