- removing expirationDate is null check for all the queries that doesn't filter by date