Add @job to the live/expired data grouping