Fix bugs in previous commits

src/pretix/base/exporters/orderlist.py

@@ -185,6 +185,7 @@ class OrderListExporter(MultiSheetListExporter):
 
         if filters:
             return qs.annotate(**annotations).filter(**filters)
+        return qs
 
     def iterate_orders(self, form_data: dict):
         p_date = OrderPayment.objects.filter(

src/pretix/presale/views/event.py

@@ -490,7 +490,6 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
                 filter_qs_by_attr(self.request.event.subevents_annotated(self.request.sales_channel.identifier).using(settings.DATABASE_REPLICA), self.request),
                 before, after, ebd, set(), self.request.event,
                 self.kwargs.get('cart_namespace'),
-                self.request.GET.get('voucher'),
                 voucher,
             )