add expire date field
consider expiration date when filtering