diff --git a/contracts/admin.py b/contracts/admin.py
index c12e8285262b1afe2c63bf96361dbf55f8d4ec87..e39fc25524b56adc1a99f4597b8dedc1fd935a09 100644
--- a/contracts/admin.py
+++ b/contracts/admin.py
@@ -161,8 +161,12 @@ class ContractAdmin(
 ):
     form = ContractAdminForm
 
+    ordering = ("name",)
+    search_fields = ("name",)
+
     readonly_fields = ("created_by",)
     autocomplete_fields = (
+        "primary_contract",
         "types",
         "filing_area",
         "issues",
@@ -379,6 +383,16 @@ class ContractFilingAreaAdmin(MarkdownxGuardedModelAdmin):
 class ContracteeAdmin(OwnPermissionsMixin, MarkdownxGuardedModelAdmin):
     model = Contractee
 
+    fields = (
+        "name",
+        "address_street_with_number",
+        "address_district",
+        "address_zip",
+        "address_country",
+        "ico_number",
+        "department",
+        "role",
+    )
     search_fields = (
         "name",
         "department",
@@ -390,6 +404,18 @@ class ContracteeAdmin(OwnPermissionsMixin, MarkdownxGuardedModelAdmin):
 class SigneeAdmin(OwnPermissionsMixin, MarkdownxGuardedModelAdmin):
     model = Signee
 
+    fields = (
+        "name",
+        "entity_type",
+        "address_street_with_number",
+        "address_district",
+        "address_zip",
+        "address_country",
+        "ico_number",
+        "date_of_birth",
+        "department",
+        "role",
+    )
     search_fields = (
         "name",
         "department",