Improve expired jobs [RD-50]