Added expiration date filtering