Add expiredDate to query