Added additional regex for job id