diff --git a/indigo_app/forms/works.py b/indigo_app/forms/works.py
index c7c86dae2..d65c945f7 100644
--- a/indigo_app/forms/works.py
+++ b/indigo_app/forms/works.py
@@ -1388,9 +1388,10 @@ class WorkChooserForm(forms.Form):
     q = forms.CharField(required=False)
 
     def clean_locality(self):
+        # always update the queryset on the locality field for rendering (country may be None)
+        self.fields['locality'].queryset = Locality.objects.filter(country=self.cleaned_data.get('country'))
+
         if self.cleaned_data.get('country'):
-            # update the queryset on the locality field for rendering
-            self.fields['locality'].queryset = Locality.objects.filter(country=self.cleaned_data['country'])
             if self.cleaned_data.get('locality') and self.cleaned_data['locality'].country != self.cleaned_data['country']:
                 return None
         else:
@@ -1398,14 +1399,13 @@ def clean_locality(self):
         return self.cleaned_data['locality']
 
     def filter_queryset(self, qs):
-        if self.cleaned_data['country']:
+        if self.cleaned_data.get('country'):
             qs = qs.filter(country=self.cleaned_data['country'])
-
-        if self.cleaned_data['locality']:
+            # only (and always) filter on locality if country is set -- locality=None for national works
             qs = qs.filter(locality=self.cleaned_data['locality'])
 
         if self.cleaned_data['q']:
-            qs = qs.filter(title__icontains=self.cleaned_data['q'])
+            qs = qs.filter(Q(title__icontains=self.cleaned_data['q']) | Q(frbr_uri__icontains=self.cleaned_data['q']))
 
         return qs
 
diff --git a/indigo_app/templates/indigo_app/place/_work_chooser_list.html b/indigo_app/templates/indigo_app/place/_work_chooser_list.html
index 738403d4b..efc149e0f 100644
--- a/indigo_app/templates/indigo_app/place/_work_chooser_list.html
+++ b/indigo_app/templates/indigo_app/place/_work_chooser_list.html
@@ -1,5 +1,10 @@
 {% load i18n %}
 
+<tr>
+  <td colspan="4" class="text-muted text-center">
+    {% blocktrans with count=paginator.count %}{{ count }} total{% endblocktrans %}
+  </td>
+</tr>
 {% for work in work_list %}
   <tr>
     <td><input type="radio" name="{{ work_field }}" value="{{ work.pk }}" id="work-chooser-work-{{ work.pk }}"></td>