diff --git a/Changelog.md b/Changelog.md
index c3b3bb7..2fd807b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Bugfixes:
    - Mountain Ranges: add country at the end. sort the range names in alphabetical order.
    - Persons: should have organisation name in the list view
    - Resources: Alphabetically sort the titles
+  - issue#10077: efficient input lookup for organization column in Person
 
 ## 1.8 (2022-01-04)
 
@@ -87,4 +88,4 @@ Bugfixes:
 
 Features:
   - First release includes functioning django admin interfaces for 
-  `Person` and `Range` models
\ No newline at end of file
+  `Person` and `Range` models
diff --git a/app/admin.py b/app/admin.py
index a5bb790..34589ae 100644
--- a/app/admin.py
+++ b/app/admin.py
@@ -59,6 +59,7 @@ class PersonAdmin(admin.ModelAdmin):
         }),
     )
     list_display = ['id', 'full_name', 'organization']
+    autocomplete_fields = ['organization']
 #    list_display_links = ['id']
 
 
diff --git a/app/models.py b/app/models.py
index fd1458d..4980def 100644
--- a/app/models.py
+++ b/app/models.py
@@ -428,7 +428,7 @@ class Organisation(models.Model):
             else:
                 name = f"{self.organisation_english}"
         else:
-            name = 'NO NAME DEFINED!!!'
+            name = '---'
 
         return name