Fix Expired logic to catch Jobs never updated