[#58926460] After a job update ensure the correct job is tracked

@macumber You'll love this patch.