added filtering on drafts and schedules