batch id minor bug fix, tracking efficiency improved