Updated reminders logic to support all 3 expiry types