refine job_id tracking