Move batch calls to the end of /endpoints