diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py
index b61012ba55..5474376efe 100644
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -1310,6 +1310,8 @@ class CustomerFilterForm(FilterForm):
                 Q(email__icontains=query)
                 | Q(name_cached__icontains=query)
                 | Q(identifier__istartswith=query)
+                | Q(external_identifier__icontains=query)
+                | Q(notes__icontains=query)
             )
 
         if fdata.get('status') == 'active':
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/customer.html b/src/pretix/control/templates/pretixcontrol/organizers/customer.html
index c19ea15eef..17b68a1ffc 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/customer.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/customer.html
@@ -65,7 +65,7 @@
                                 –{% endif %}</dd>
                         {% if customer.notes %}
                             <dt>{% trans "Notes" %}</dt>
-                            <dd>{{ customer.notes }}</dd>
+                            <dd>{{ customer.notes|linebreaks }}</dd>
                         {% endif %}
                         </dl>
                     </form>
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/customers.html b/src/pretix/control/templates/pretixcontrol/organizers/customers.html
index b7803845fa..3bba675fcb 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/customers.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/customers.html
@@ -62,7 +62,7 @@
                     <th>{% trans "Name" %}
                         <a href="?{% url_replace request 'ordering' '-name' %}"><i class="fa fa-caret-down"></i></a>
                         <a href="?{% url_replace request 'ordering' 'name' %}"><i class="fa fa-caret-up"></i></a></th>
-                    <th>{% trans "External ID" %}
+                    <th>{% trans "External identifier" %}
                         <a href="?{% url_replace request 'ordering' '-external_identifier' %}"><i class="fa fa-caret-down"></i></a>
                         <a href="?{% url_replace request 'ordering' 'external_identifier' %}"><i class="fa fa-caret-up"></i></a></th>
                     <th></th>